From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 09 Jul 2007 13:40:14 GMT
Subject: Re: rerere fails to record resolution if file doesn't exist in merge base
Message-ID: <Pine.LNX.4.64.0707091438540.5546@racer.site>
In-Reply-To: <20070709113543.GA12633@informatik.uni-freiburg.de>

Hi,

On Mon, 9 Jul 2007, Uwe Kleine-K?nig wrote:

> Junio C Hamano wrote:
>
> > Not even compile tested, but something like this should do.
> It compiles, but seems not to work.  I will try to make up a test.

I compiled it, and it works as expected.  For safety, git-rerere leaves 
the index unmerged, so that you can verify that you wanted this 
resolution.

Will resubmit with a test case.

Ciao,
Dscho