Re: merge conlict?

[Glenn Morris]

Eli Zaretskii wrote:

> 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?

I'm confused by this too.

The actual diffs seem to be a lot of recent changes being applied for
a second time. I could understand if there was a message where they
got unapplied first by mistake. But how can the same changes get
applied twice to the trunk?

Also, each of revs 99378-99381 now appears twice, referring to a
different change each time. Eg these are both r99379:

http://lists.gnu.org/archive/html/emacs-diffs/2010-01/msg00146.html
http://lists.gnu.org/archive/html/emacs-diffs/2010-01/msg00106.html

Is this how it supposed to work?