Re: merge conlict?

[Eli Zaretskii]

> From: Teemu Likonen <address@hidden>
> Cc: address@hidden
> Date: Mon, 25 Jan 2010 15:17:12 +0200
> 
> revno: 99379 [merge]
> revision-id: address@hidden
> parent: address@hidden
> parent: address@hidden
> committer: Mark A. Hershberger <address@hidden>
> branch nick: trunk
> timestamp: Sun 2010-01-24 23:52:26 -0500
> message:
>   merge conflict
> ------------------------------------------------------------
> 
> There's are the revision IDs of this merge's parents. To see what
> changes the merge brought from former-trunk to Mark's branch:
> 
> $ bzr diff -r \
>     revid:address@hidden
> 
> Mark pushed this branch to the official Emacs branch on
> bzr.savannah.gnu.org so now it became the branch we call "trunk".
> 
> To see what changes Mark made in his private branch and thus brought to
> the main development line:
> 
> $ bzr diff -r \
>     revid:address@hidden
> 
> To see how Mark resolved the conflicting merge:
> 
> $ git show b8de0d6
> 
> How to interpret Git's combined diff format is documented here:
> 
> http://www.kernel.org/pub/software/scm/git/docs/git-diff.html

Thanks.  So now I understand that the conflict was only in the
ChangeLog files (as expected).

Also, revno 99379 included several unrelated changes.  Am I confused
or did we agree to avoid that?