diff options
| author | Kevin Geiss <kevin@desertsol.com> | 2005-11-14 09:43:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-16 13:20:59 -0800 |
| commit | 5b4525eb8b6a4a131d0cc10075165829f754dcc2 (patch) | |
| tree | 4dda103301d7b70ec6e6e361d4a8d2cac24eccb4 | |
| parent | 8b3fbeef395295c0d2de61265632ed30eda7bf0a (diff) | |
| download | git-5b4525eb8b6a4a131d0cc10075165829f754dcc2.tar.gz git-5b4525eb8b6a4a131d0cc10075165829f754dcc2.tar.xz | |
git-cvsexportcommit.perl: fix typos in output
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-cvsexportcommit.perl | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |