From 412e414075fb629ac3e99b6e40114a2e8fafb81f Mon Sep 17 00:00:00 2001 From: James Youngman Date: Tue, 31 May 2011 10:19:55 +0100 Subject: [PATCH 2/2] Fix punctuation in import-gnulib.sh --- import-gnulib.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/import-gnulib.sh b/import-gnulib.sh index 1f7d8bd..b6847df 100755 --- a/import-gnulib.sh +++ b/import-gnulib.sh @@ -246,7 +246,7 @@ DO_NOT_WANT_CHANGELOG_DRIVER. Example: git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver' - git config merge.merge-changelog.driver /usr/local/bin/git-merge-changelog %O %A %B + git config merge.merge-changelog.driver '/usr/local/bin/git-merge-changelog %O %A %B' echo 'ChangeLog merge=merge-changelog' >> .gitattributes " if [ -z "$DO_NOT_WANT_CHANGELOG_DRIVER" ] ; then -- 1.7.2.5