Skip to content

Commit

Permalink
git-cvsexportcommit.perl: fix typos in output
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Kevin Geiss authored and Junio C Hamano committed Nov 16, 2005
1 parent 8b3fbee commit 5b4525e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions git-cvsexportcommit.perl
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@

# 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`;
Expand Down Expand Up @@ -188,7 +188,7 @@

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);
}
Expand Down

0 comments on commit 5b4525e

Please sign in to comment.