Fix small mistake.

[pspp] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index da6acc744cd3959c77e309612a97e0a92ad64920..43125e06a92cea5aefd29fc63fbc896f354acb24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2009-07-02  Bruno Haible  <bruno@clisp.org>
+
+       * lib/git-merge-changelog.c (compute_mapping): Fix determination of
+       best_i.
+
+2009-07-02  Bruno Haible  <bruno@clisp.org>
+
+       Speed up approximate search for matching ChangeLog entries.
+       * lib/git-merge-changelog.c (entry_fstrcmp): Add a lower_bound
+       argument. Call fstrcmp_bounded instead of fstrcmp.
+       (compute_mapping, try_split_merged_entry, main): Update callers.
+
+2009-07-02  Bruno Haible  <bruno@clisp.org>
+
+       * lib/git-merge-changelog.c (main): Add comment about git cherry-pick.
+
 2009-06-30  Bruno Haible  <bruno@clisp.org>
 
        Reduce the number of uc_is_cased calls.