modify/delete conflict resolution overwrites untracked file

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index e2664ef01308fd0fb65d47b25e0ae73a65aa6262..e43920296182f320dac31b5832a30844ffaef38f 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -952,7 +952,7 @@ sub commit {
        } 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;