Typo in comment.

diff --git a/ChangeLog b/ChangeLog
index c1b645e8c75b80fa7aab3261c7a835825509b408..0af9a847fda77cf84d95c39e5cce5346361ebc8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-17  Bruno Haible  <bruno@clisp.org>
+
+       * lib/git-merge-changelog.c: Fix typo in comment.
+       Reported by Reuben Thomas <rrt@sc3d.org>.
+
 2009-03-17  Reuben Thomas  <rrt@sc3d.org>
 
        * m4/regex.m4: update and improve help for

diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c
index 524d5d34939242a658fbd989ce57cb05de2fdb03..22d2bfd41e9aa3580728c228ee88b78fa38aaaeb 100644 (file)
--- a/lib/git-merge-changelog.c
+++ b/lib/git-merge-changelog.c
@@ -21,7 +21,7 @@
    default merge driver has no clue how to deal with this. Furthermore
    the conflicts are presented with more <<<< ==== >>>> markers than
    necessary; this is because the default merge driver makes pointless
-   effects to look at the individual line changes inside a ChangeLog entry.
+   efforts to look at the individual line changes inside a ChangeLog entry.
 
    This program serves as a 'git' merge driver that avoids these problems.
    1. It produces no conflict when ChangeLog entries have been inserted