From: Nanako Shiraishi <nanako3@lavabit.com>
Date: Tue, 03 Feb 2009 10:05:17 GMT
Subject: Re: Heads up: major rebase -i -p rework coming up
Message-ID: <20090203190517.6117@nanako3.lavabit.com>
In-Reply-To: <alpine.DEB.1.00.0901260026310.14855@racer>

Quoting Johannes Schindelin <Johannes.Schindelin@gmx.de>:

> Nanako had a script at some stage; I would prefer an subcommand to "git 
> rerere" which reconstructs the whole merge in-memory, and then records the 
> conflict's resolution.

I'm sorry but I'm not sure what script of mine you are referring to.

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/