[Sugar-devel] Analysing code changes, git diff

[Tomeu Vizoso]

On Fri, Sep 10, 2010 at 18:05, Sascha Silbe
<sascha-ml-reply-to-2010-3 at silbe.org> wrote:
> 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)?

No idea, I'm a very basic user of git :/

Regards,

Tomeu

> Sascha
>
> --
> http://sascha.silbe.org/
> http://www.infra-silbe.de/
>
> _______________________________________________
> Sugar-devel mailing list
> Sugar-devel at lists.sugarlabs.org
> http://lists.sugarlabs.org/listinfo/sugar-devel
>
>