git-merge-changelog: Enable --split-merged-entry by default.

[gnulib.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 7924d20..e7ab8ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2010-05-23  Bruno Haible  <bruno@clisp.org>
+
+       git-merge-changelog: Enable --split-merged-entry by default.
+       * lib/git-merge-changelog.c (main): Set split_merged_entry to true.
+       (usage): Don't mention this option any more.
+       Reported by Ralf Wildenhues.
+
+2010-05-23  Jim Meyering  <meyering@redhat.com>
+
+       test-pwrite: do not leave behind a test file named "out"
+       Revert commit d8fa18472a54c1cb2674c296b3d82443f234d5f7.
+       The trivial-looking use of init.sh is really necessary.
+       It ensures that the temporary file, "out", is created in
+       a temporary directory, and removed upon termination.
+       * tests/test-pwrite.sh: Re-add file.
+       * modules/pwrite-tests: Reference it.
+
+2010-05-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Fix output redirection buglet in init.sh.
+       * tests/init.sh: Fix redirection of stderr.
+
+2010-05-20  Simon Josefsson  <simon@josefsson.org>
+
+       * modules/valgrind-tests (configure.ac): Invoke gl_VALGRIND_TESTS.
+
 2010-05-17  Simon Josefsson  <simon@josefsson.org>
 
        * modules/valgrind-tests: New file.