| commit | 5e568f9e3027797842807213ce590140c9daf9ce | |
| author | Alexander Gavrilov <angavrilov@gmail.com> | |
| Sat, 23 Aug 2008 19:21:21 +0000 (23 23:21 +0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 24 Aug 2008 06:59:20 +0000 (23 23:59 -0700) | ||
| tree | fa21172efdcaa4720c73c814e21721323c9abe7b | treesnapshot (tar.gz zip) |
| parent | 913e0e99b6a6e63af6a062622a1f94bd78fd8052 | commitdiff |
Respect core.autocrlf in combined diff
Fix git-diff to make it produce useful 3-way diffs for merge conflicts in
repositories with autocrlf enabled. Otherwise it always reports that the
whole file was changed, because it uses the contents from the working tree
without necessary conversion.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Fix git-diff to make it produce useful 3-way diffs for merge conflicts in
repositories with autocrlf enabled. Otherwise it always reports that the
whole file was changed, because it uses the contents from the working tree
without necessary conversion.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| combine-diff.c | diffblobblamehistory | |
| t/t4015-diff-whitespace.sh | diffblobblamehistory |