Hi Rusty, On Fri, 2 Jan 2009 16:17:40 +1030 Rusty Russell <rusty@xxxxxxxxxxxxxxx> wrote: > > On Friday 02 January 2009 13:05:57 Stephen Rothwell wrote: > Yes, I've had several 'git blame' pointing to merges from Ingo's tree. > And they tend to be n-way merges, so tracing it down is too hard. If you are in the middle of a merge operations with conflicts, the "gitk --merge" is generally useful. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpnJNFOBAH0e.pgp
Description: PGP signature
