Re: merge conlict?

[Eli Zaretskii]

> From: Teemu Likonen <address@hidden>
> Cc: "Mark A. Hershberger" <address@hidden>,  address@hidden
> Date: Mon, 25 Jan 2010 13:33:38 +0200
> 
> It would probably help if Bazaar supported combined diff format. With
> Git we can trivially see the actual changes introduced by the merge
> commit:
> 
> 
> $ git show b8de0d6

Please help me understand what you ``trivially'' see in this output.
I clearly see here changes not made by Mark, and having no Git
knowledge I cannot discern between the changes, because the format
shown is not exactly the Diff format.