From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 07 Mar 2013 07:25:52 GMT
Subject: Re: [PATCH 2/2] p4merge: create a virtual base if none available
Message-ID: <7v8v5zoem7.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAJDDKr6+VRnc-HK52woHHLtAqXau=76Gc+Ag=keiMGffuco64A@mail.gmail.com>

David Aguilar <davvid@gmail.com> writes:

> How do we feel about this duplication?
> Should we make a common function in the git-sh-setup.sh,
> or is it okay to have a slightly modified version of this
> function in two places?

It probably is a good idea to have it in one place.  That would also
solve the @@DIFF@@ replacement issue you noticed at the same time.