Re: Conflict markers in mergetool $LOCAL ?
From: Seth House <hidden>
Date: 2016-06-15 22:49:20
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
