From: Bruno Haible Date: Thu, 2 Jul 2009 22:40:49 +0000 (+0200) Subject: Fix small mistake. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82ddbdf252448bb0e759bfe691f54645ca62ce7a;p=pspp Fix small mistake. --- diff --git a/ChangeLog b/ChangeLog index 3919830a9d..43125e06a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-07-02 Bruno Haible + + * lib/git-merge-changelog.c (compute_mapping): Fix determination of + best_i. + 2009-07-02 Bruno Haible Speed up approximate search for matching ChangeLog entries. diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c index 986b8c832d..dadbd91851 100644 --- 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 + Copyright (C) 2008-2009 Bruno Haible 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; } }