summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9202434)
raw | patch | inline | side by side (parent: 9202434)
author | Sven Verdoolaege <skimo@kotnet.org> | |
Sat, 17 Jun 2006 17:46:40 +0000 (19:46 +0200) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sat, 17 Jun 2006 23:06:18 +0000 (16:06 -0700) |
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-cvsexportcommit.perl | patch | blob | history |
index 57088c3f0bbdcb27c79c6b3c22dc1b4e7327bb0b..d1051d074bcf685dcc57cae90cca9053dc71a76f 100755 (executable)
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
and $status[0] !~ m/^File: no file /) {
$dirty = 1;
warn "File $f is already known in your CVS checkout -- perhaps it has been added by another user. Or this may indicate that it exists on a different branch. If this is the case, use -f to force the merge.\n";
- warn "Status was: $status\n";
+ warn "Status was: $status[0]\n";
}
}
foreach my $f (@mfiles, @dfiles) {