Re: merge conlict?

[Katsumi Yamaoka]

BTW, may I fix the last bogus commit in trunk/doc/misc/ChangeLog ?
Or is there a plan to fix those `merge conlict'?

http://article.gmane.org/gmane.emacs.diffs/104054
-------------------------------------------------
revno: 99378
committer: Mark A. Hershberger <mhershberger <at> intrahealth.org>
[...]
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2010-01-18 03:54:24 +0000
+++ b/doc/misc/ChangeLog        2010-01-19 19:39:22 +0000
@@ -1,3 +1,7 @@
+2010-01-19  Mark A. Hershberger  <mah <at> everybody.org>
+
+       * cc-mode.texi: Replace references to obsolete c-subword-mode.
+
 2010-01-18  Juanma Barranquero  <lekktu <at> gmail.com>

        * ada-mode.texi (Project File Overview): Fix typo.
[...]

http://article.gmane.org/gmane.emacs.diffs/104057
-------------------------------------------------
revno: 99379 [merge]
committer: Mark A. Hershberger <mhershberger <at> intrahealth.org>
[...]
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2010-01-19 19:39:22 +0000
+++ b/doc/misc/ChangeLog        2010-01-25 04:52:26 +0000
@@ -1,4 +1,8 @@
-2010-01-19  Mark A. Hershberger  <mah <at> everybody.org>
+2010-01-24  Mark A. Hershberger  <mah <at> everybody.org>
+
+       * gnus.texi (Score File Format): Fix typo.
+
+2010-01-21  Katsumi Yamaoka  <yamaoka <at> jpl.org>

        * cc-mode.texi: Replace references to obsolete c-subword-mode.
[...]