diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-17 17:08:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-17 17:08:36 -0700 |
| commit | fc5201ac9f17abf8b70b248b17595f3f3d35c056 (patch) | |
| tree | 59d1b7aa95bddfce3c535e8a3c752ef9298ff632 /git-cvsexportcommit.perl | |
| parent | Merge branch 'master' into next (diff) | |
| parent | diff options: add --color (diff) | |
| download | tgif-fc5201ac9f17abf8b70b248b17595f3f3d35c056.tar.xz | |
Merge branch 'js/diff'
Diffstat (limited to 'git-cvsexportcommit.perl')
| -rwxr-xr-x | git-cvsexportcommit.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl index 57088c3f0b..d1051d074b 100755 --- a/git-cvsexportcommit.perl +++ b/git-cvsexportcommit.perl @@ -134,7 +134,7 @@ foreach my $f (@afiles) { 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) { |