From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Dec 2008 20:51:59 GMT
Subject: Re: [PATCH] modify/delete conflict resolution overwrites untracked file
Message-ID: <7vzlj3ycr4.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20081210201259.GA12928@localhost>

Clemens Buchacher <drizzd@aon.at> writes:

> If it's a regression, it dates far back, since 1.5.0 fails as well.

A good lit(h)mus test to see if it is a regression or just a plain bug in
the recursive strategy would be to see what 'resolve' strategy does
(replace "merge" with "merge -s resolve" in your test).