[PATCH 4/4] git-cvsexportcommit.perl: fix typos in output
From: Kevin Geiss <hidden>
Date: 2016-06-15 22:42:11
Subsystem:
the rest · Maintainer:
Linus Torvalds
--- git-cvsexportcommit.perl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) applies-to: 717dd9ec543f5d2d6cc4b9c0af41c2f80c615f0f 7c7460d88ef6d677ad9fa29880c2fb47e4a88d6b
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index d49494a..5a8c011 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl@@ -78,7 +78,7 @@ $opt_v && print "Applying to CVS commit # 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 $commitfil 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); }
--- 0.99.9.GIT