From: Jacob Helwig <jacob.helwig@gmail.com>
Date: Tue, 17 Aug 2010 18:00:14 GMT
Subject: Re: Conflict markers in mergetool $LOCAL ?
Message-ID: <f595ee73-b1a3-4797-bf55-20c0f1b309e0@email.android.com>
In-Reply-To: <loom.20100817T185804-167@post.gmane.org>

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

"Seth House" <seth@eseth.com> wrote:

>David Aguilar <davvid <at> gmail.com> writes:
>> 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