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. Cheers, Phil
