From: Seth House <seth@eseth.com>
Date: Tue, 17 Aug 2010 21:04:20 GMT
Subject: Re: Conflict markers in mergetool $LOCAL ?
Message-ID: <loom.20100817T230158-934@post.gmane.org>
In-Reply-To: <f595ee73-b1a3-4797-bf55-20c0f1b309e0@email.android.com>

Jacob Helwig <jacob.helwig <at> gmail.com> writes:
> That actually looks exactly like it should.  The order of the windows
> that vimdiff uses is (IIRC): ours, on-disk file, theirs.

Hm, you’re right. I just found the git-mergetool--lib script on my
system and it opens vimdiff with $LOCAL $MERGED $REMOTE. Thank you, that
opened my eyes enough to clarify my question:

The conflict markers don't seem very useful in the context of a merge
tool. I would prefer to see two windows in vimdiff with each side of the
conflict, respectively. Something like:

vimdiff $MERGED-left-hand-conflicts $MERGED-right-hand-conflicts

Is that possible with Git -- or does anyone know of external tools to
help with such a workflow?