At Thu, 06 May 2010 12:29:04 +0100, Philip Jackson wrote: > > At Sun, 25 Apr 2010 22:02:13 -0400, > David Abrahams wrote: > > > > When I use `e' to resolve conflicts during a rebase, then `R' to > > > continue rebasing, I often get into trouble because I haven't saved > > > the merged files. This little patch seems to fix it nicely for me. > > > > Ah, whoops wrong patch! > > > > Please try this one instead: > > Applied.
I'd really like it to offer to stage the merged file for me, since that's almost always what I want. Anyone want to implement that too? :-) -- Dave Abrahams Meet me at BoostCon: http://www.boostcon.com BoostPro Computing http://www.boostpro.com
