Re: [PATCH 2/2] p4merge: create a virtual base if none available

David Aguilar [off-list ref] 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.