[Emacs-diffs] trunk r116860: Fix up recent merge ChangeLog duplication

[Glenn Morris]

------------------------------------------------------------
revno: 116860
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2014-03-23 10:56:34 -0700
message:
  Fix up recent merge ChangeLog duplication
  
  Perhaps the merge was done without using bzrmerge.el
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-23 07:36:26 +0000
+++ b/lisp/ChangeLog    2014-03-23 17:56:34 +0000
@@ -26,18 +26,6 @@
        (Bug#3647) --- unfortunately, only for freshly-compiled code.
        Please make bootstrap.
 
-2014-03-23  Richard Stallman  <address@hidden>
-
-       * battery.el (battery-linux-sysfs): Search for each field
-       from the beginning of the buffer.
-
-2014-03-23  Daniel Colascione  <address@hidden>
-
-       * emacs-lisp/cl-macs.el (cl--do-arglist): Use a little `cl-loop'
-       list to look for keyword arguments instead of `memq', fixing
-       (Bug#3647) --- unfortunately, only for freshly-compiled code.
-       Please make bootstrap.
-
 2014-03-22  Glenn Morris  <address@hidden>
 
        * dired.el (dired-read-regexp): Make obsolete.

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2014-03-23 07:36:26 +0000
+++ b/test/ChangeLog    2014-03-23 17:56:34 +0000
@@ -1,17 +1,15 @@
-2014-03-23  Daniel Colascione  <address@hidden>
-
-       * automated/subword-tests.el (subword-tests2): More subword tests.
-
-2014-03-23  Daniel Colascione  <address@hidden>
-
-       * automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
-       test: correct parsing of keyword arguments.
-
 2014-03-23  Dmitry Gutov  <address@hidden>
 
        * automated/package-test.el (package-test-describe-package):
        Fix test failure in non-graphical mode.
 
+2014-03-23  Daniel Colascione  <address@hidden>
+
+       * automated/subword-tests.el (subword-tests2): More subword tests.
+
+       * automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
+       test: correct parsing of keyword arguments.
+
 2014-03-22  Dmitry Gutov  <address@hidden>
 
        * automated/package-test.el (package-test-describe-package):
@@ -30,11 +28,6 @@
        * automated/data/package/archive-contents:
        Add info about the new package.
 
-2014-03-23  Daniel Colascione  <address@hidden>
-
-       * automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
-       test: correct parsing of keyword arguments.
-
 2014-03-07  Michael Albinus  <address@hidden>
 
        * automated/tramp-tests.el (tramp-copy-size-limit): Declare.