Mercurial > hg > octave-nkf > gnulib-hg
changeset 11410:3c2e2d1bd42c
Typo in comment.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Wed, 18 Mar 2009 02:34:04 +0100 |
parents | 741b8885f21f |
children | c922e2cc701c |
files | ChangeLog lib/git-merge-changelog.c |
diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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