Hi Dmitry, On Thu, 11 Dec 2008 13:11:20 +0300 "Dmitry Eremin-Solenikov" <dbaryshkov@xxxxxxxxx> wrote: > > Unfortunately those changes are independant, so I don't quite > understand what to do. > If you'd prefer, I can provide merged versions of all 3 files, so that > you can use this > as merge resolution via git-rerere. Is that suitable for you? That would be a great help, thanks. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpUBddUw0sFD.pgp
Description: PGP signature
