Re: merge conlict?

[Andreas Schwab]

Eli Zaretskii <address@hidden> writes:

>> Date: Sun, 24 Jan 2010 23:52:26 -0500
>> From: "Mark A. Hershberger" <address@hidden>
>> To: address@hidden
>> Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r99379: merge conflict
>> Content-Type: text/plain; charset="us-ascii"
>> 
>> ------------------------------------------------------------
>> revno: 99379 [merge]
>> committer: Mark A. Hershberger <address@hidden>
>> branch nick: trunk
>> timestamp: Sun 2010-01-24 23:52:26 -0500
>> message:
>>   merge conflict
>
> What does this "merge conflict" in the commit message mean?  Why do
> so many unrelated files (see below) seem to be modified in one go?

That's a normal merge of trunk into a branch.  Not much different from
eg. address@hidden

Andreas.

-- 
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."