diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-05 21:21:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-05 21:21:08 -0700 |
| commit | 04bb50f45dda9aeb755e943cbc9df264cfc8cbc5 (patch) | |
| tree | a863b7f6bcfee344db722621d08bdc1ddbbacc6f /git-cvsimport.perl | |
| parent | correct access right for git-svn-dcommit test (diff) | |
| parent | RelNotes 1.5.6.5 updates (diff) | |
| download | tgif-04bb50f45dda9aeb755e943cbc9df264cfc8cbc5.tar.xz | |
Merge branch 'maint'
* maint:
RelNotes 1.5.6.5 updates
diff.renamelimit is a basic diff configuration
git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout.
Documentation: typos / spelling fixes in older RelNotes
Diffstat (limited to 'git-cvsimport.perl')
| -rwxr-xr-x | git-cvsimport.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl index e2664ef013..e439202961 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -952,7 +952,7 @@ while (<CVS>) { } elsif (/^-+$/) { # end of unknown-line processing $state = 1; } elsif ($state != 11) { # ignore stuff when skipping - print "* UNKNOWN LINE * $_\n"; + print STDERR "* UNKNOWN LINE * $_\n"; } } commit() if $branch and $state != 11; |