War on whitespace
This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
@ -197,7 +197,7 @@ if (@canstatusfiles) {
|
||||
# ... validate new files,
|
||||
foreach my $f (@afiles) {
|
||||
if (defined ($cvsstat{$f}) and $cvsstat{$f} ne "Unknown") {
|
||||
$dirty = 1;
|
||||
$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: $cvsstat{$f}\n";
|
||||
}
|
||||
|
Reference in New Issue
Block a user