merge conlict?

[Eli Zaretskii]

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

> removed:
>   admin/revdiff
> modified:
>   .bzrignore
>   ChangeLog
>   admin/ChangeLog
>   admin/notes/bugtracker
>   configure
>   configure.in
>   doc/emacs/ChangeLog
>   doc/emacs/trouble.texi
>   doc/misc/ChangeLog
>   doc/misc/gnus.texi
>   etc/NEWS
>   lisp/ChangeLog
>   lisp/dired-aux.el
>   lisp/dired.el
>   lisp/emacs-lisp/advice.el
>   lisp/emacs-lisp/assoc.el
>   lisp/indent.el
>   lisp/isearch.el
>   lisp/jka-compr.el
>   lisp/mail/mail-utils.el
>   lisp/mail/rmail.el
>   lisp/mail/rmailmm.el
>   lisp/net/tramp-imap.el
>   lisp/net/tramp-smb.el
>   lisp/progmodes/ada-mode.el
>   lisp/progmodes/cc-defs.el
>   lisp/progmodes/cc-engine.el
>   lisp/term.el
>   lisp/term/xterm.el
>   lisp/textmodes/sgml-mode.el
>   lisp/url/ChangeLog
>   lisp/url/url-util.el
>   lisp/vc-git.el
>   src/ChangeLog
>   src/alloc.c
>   src/coding.c
>   src/filelock.c
>   src/image.c
>   src/keymap.c
>   src/lisp.h
>   src/lread.c
>   src/xdisp.c