X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-cvsexportcommit.perl;h=5a8c011802c46356c9c842282baca8f6fb54f01b;hb=b17e659dd4007cb1d3eb5ac32b524c0c5ab59601;hp=da7dcda3b639d0857c6cd49b361d8e2dd49fa35d;hpb=ebdbfa8b556c9b4cebf27cb5f9364c9c19274620;p=git.git

diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index da7dcda3..5a8c0118 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,9 +188,9 @@ 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;
+    exit(1);
 }