From: Seth House <seth@eseth.com>
Date: Tue, 17 Aug 2010 17:08:44 GMT
Subject: Re: Conflict markers in mergetool $LOCAL ?
Message-ID: <loom.20100817T185804-167@post.gmane.org>
In-Reply-To: <20100817093008.GA26357@gmail.com>

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