From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 Oct 2008 21:50:12 GMT
Subject: Re: [PATCH] git-merge-recursive: honor merge.conflictstyle once again
Message-ID: <7vmyh05k6j.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1224376850.19061.1.camel@mattlaptop2.local>

Matt McCutchen <matt@mattmccutchen.net> writes:

> This was originally implemented in c236bcd06138bcbc929b86ad1a513635bf4847b2
> but was lost to a mismerge in 9ba929ed652f5ed7707f1c684999af4ad02c4925.

Good eyes; thanks.