[Sugar-devel] Analysing code changes, git diff

[Sascha Silbe]

Excerpts from Tomeu Vizoso's message of Thu Sep 09 15:01:01 +0200 2010:

> Don't know about better diffs, but I like meld as driven by git mergetool.

I like doing the merging in my text editor (though the presentation
meld uses is interesting). You don't happen to know how I could tell git
to include all three versions (common ancestor and both branch heads)
instead of just two (the branch heads)?

Sascha

--
http://sascha.silbe.org/
http://www.infra-silbe.de/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
Url : http://lists.sugarlabs.org/archive/sugar-devel/attachments/20100910/626346f4/attachment.pgp