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/
signature.asc
Description: PGP signature
_______________________________________________ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
