Fix small mistake.

diff --git a/ChangeLog b/ChangeLog
index 3919830a9dfc941abce52af98a52d6b7a3d9cbb7..43125e06a92cea5aefd29fc63fbc896f354acb24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c
index 986b8c832dc9c0c0898c3bad3ac14c0d1e8f6eca..dadbd918515fca7b7f9f23bc9c4aca05aaa72737 100644 (file)
--- a/lib/git-merge-changelog.c
+++ b/lib/git-merge-changelog.c
@@ -1,5 +1,5 @@
 /* git-merge-changelog - git "merge" driver for GNU style ChangeLog files.
-   Copyright (C) 2008 Bruno Haible <bruno@clisp.org>
+   Copyright (C) 2008-2009 Bruno Haible <bruno@clisp.org>
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -438,7 +438,7 @@ compute_mapping (struct changelog_file *file1, struct changelog_file *file2,
                                   best_i_similarity);
                  if (similarity > best_i_similarity)
                    {
-                     best_i = i;
+                     best_i = ii;
                      best_i_similarity = similarity;
                    }
                }