From: Bruno Haible Date: Wed, 18 Mar 2009 01:34:04 +0000 (+0100) Subject: Typo in comment. X-Git-Tag: v0.1~6077 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=7aab7954ea3c3971740f076e38039d28775948f8;p=gnulib.git Typo in comment. --- diff --git a/ChangeLog b/ChangeLog index c1b645e8c..0af9a847f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-03-17 Bruno Haible + + * lib/git-merge-changelog.c: Fix typo in comment. + Reported by Reuben Thomas . + 2009-03-17 Reuben Thomas * m4/regex.m4: update and improve help for diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c index 524d5d349..22d2bfd41 100644 --- 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