Hi Jens, On Thu, 25 Feb 2010 08:47:57 +0100 Jens Axboe <jens.axboe@xxxxxxxxxx> wrote: > > I was, unfortunately I forgot to resolve the conflict yesterday. Your > fix confuses me a bit - I was expecting the first hunk, but what is the > second hunk doing? Conceptually good though, perhaps there are more > conflicts than I was expecting :-) The second hunk was not part of the conflict, but "git diff" gives us more than just the conflicted bit of the file. > I'll update here as well so it disappears next time you pull. Thanks. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpe6XmDWwsKD.pgp
Description: PGP signature
