comparison tests/test-conflict.out @ 4679:826659bd8053

git patches: correct handling of filenames with spaces Add a trailing TAB to the "--- filename" lines if there's a space in the file name. This allows patch(1) to work correctly. The same is done for diff --nodates. This was originally suggested by Andrei Vermel, but at the time I thought git was doing something different.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 22 Jun 2007 19:06:04 -0300
parents 93a4e72b4f83
children 5af5f0f9d724
comparison
equal deleted inserted replaced
4678:a814a5b11fff 4679:826659bd8053