From: Kevin Geiss <kevin@desertsol.com>
Date: Mon, 14 Nov 2005 16:43:51 +0000 (-0700)
Subject: git-cvsexportcommit.perl: fix typos in output
X-Git-Tag: v0.99.9k~3^2~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5b4525eb8b6a4a131d0cc10075165829f754dcc2;p=git.git

git-cvsexportcommit.perl: fix typos in output

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index d49494abc..5a8c01180 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -78,7 +78,7 @@ $opt_v && print "Applying to CVS commit $commit from parent $parent\n";
 
 # grab the commit message
 `git-cat-file commit $commit | sed -e '1,/^\$/d' > .msg`;
-$? && die "Error extraction the commit message";
+$? && die "Error extracting the commit message";
 
 my (@afiles, @dfiles, @mfiles);
 my @files = `git-diff-tree -r $parent $commit`;
@@ -188,7 +188,7 @@ my $cmd = "cvs commit -F .msg $commitfiles";
 
 if ($dirtypatch) {
     print "NOTE: One or more hunks failed to apply cleanly.\n";
-    print "Resolve the conflicts and then commit using:n";
+    print "Resolve the conflicts and then commit using:\n";
     print "\n    $cmd\n\n";
     exit(1);
 }