From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 15 Mar 2010 08:29:28 GMT
Subject: Re: [PATCH 10/10] merge-recursive: add a label for ancestor
Message-ID: <7vr5nm0yzb.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20100315080703.GJ8824@progeny.tock>

Jonathan Nieder <jrnieder@gmail.com> writes:

> I would be interested to know which merge tool chokes on |||||||. ;)
> As it is, since I haven’t experienced the mechanical misbehavior, I
> am targetting humans.

Even if there weren't any broken tools, I think targetting humans is a
good thing to do, as long as we don't break ourselves (including old
rerere database).

> That’s the end of the series.  Thanks for reading.

Thanks for writing.  I think this is generally a good thing to have,
and from my cursory look I didn't see anything glaringly wrong except for
the one I already commented on the first patch.