From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 15 Mar 2010 13:18:32 GMT
Subject: Re: [PATCH 10/10] merge-recursive: add a label for ancestor
Message-ID: <jwvd3z5d8u0.fsf-monnier+inbox@gnu.org>
In-Reply-To: <20100315080703.GJ8824@progeny.tock>

> I would be interested to know which merge tool chokes on |||||||. ;)

In my case, it was smerge-mode.el (a minor mode included in Emacs since
Emacs-22, which highlights such conflicts and tries to help you resolve
them).


        Stefan


PS: As you may have guessed, I'm the primary author of this
Emacs package.