Re: Conflict markers in mergetool $LOCAL ?

That actually looks exactly like it should.  The order of the windows that vimdiff uses is (IIRC): ours, on-disk file, theirs.

"Seth House" [off-list ref] wrote:

David Aguilar <davvid <at> gmail.com> writes:

quoted

What happens if you remove this section?:

Same result. The conflict markers are still there:

http://i.imgur.com/d1vp1.png

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html