From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 07 Mar 2013 00:36:13 GMT
Subject: Re: [PATCH 1/2] p4merge: swap LOCAL and REMOTE for mergetool
Message-ID: <7vlia0nj0i.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1362601978-16911-2-git-send-email-kevin@bracey.fi>

Kevin Bracey <kevin@bracey.fi> writes:

> Reverse LOCAL and REMOTE when invoking P4Merge as a mergetool, so that
> the incoming branch is now in the left-hand, blue triangle pane, and the
> current branch is in the right-hand, green circle pane.

Given that the ordering of the three variants has been the way it is
since the very initial version by Scott, I'll sit on this patch
until hearing from those Cc'ed (who presumably do use p4merge,
unlike I who don't) that it is a good change.

Thanks.