Hi, On Tue, 3 Feb 2009, Nanako Shiraishi wrote: > Quoting Johannes Schindelin <Johannes.Schindelin@xxxxxx>: > > > 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. http://article.gmane.org/gmane.comp.version-control.git/96911 Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
