diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-06-07 09:04:01 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-06-07 09:04:01 +0200 |
commit | a6080a0a44d5ead84db3dabbbc80e82df838533d (patch) | |
tree | 37360b8334cf8459609d1fae72f8213947858cc0 /diff.c | |
parent | Merge branch 'sv/objfixes' (diff) | |
download | git-a6080a0a44d5ead84db3dabbbc80e82df838533d.tar.xz git-a6080a0a44d5ead84db3dabbbc80e82df838533d.zip |
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>
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3031,7 +3031,7 @@ void diff_addremove(struct diff_options *options, * entries to the diff-core. They will be prefixed * with something like '=' or '*' (I haven't decided * which but should not make any difference). - * Feeding the same new and old to diff_change() + * Feeding the same new and old to diff_change() * also has the same effect. * Before the final output happens, they are pruned after * merged into rename/copy pairs as appropriate. @@ -3058,7 +3058,7 @@ void diff_change(struct diff_options *options, unsigned old_mode, unsigned new_mode, const unsigned char *old_sha1, const unsigned char *new_sha1, - const char *base, const char *path) + const char *base, const char *path) { char concatpath[PATH_MAX]; struct diff_filespec *one, *two; |