author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | |
Fri, 6 Jan 2012 17:13:00 +0000 (18:13 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 6 Jan 2012 19:10:05 +0000 (11:10 -0800) | ||
commit | baf5aaa33383af656a34b7ba9039e9eb3c9e678c | |
tree | 35d95535abf0f0805ab2154b673b6f0c148e6b9c | tree | snapshot |
parent | 7ed863a85a6ce2c4ac4476848310b8f917ab41f9 | commit | diff |
xdiff: print post-image for common records instead of pre-image
Normally it doesn't matter if we show the pre-image or th post-image
for the common parts of a diff because they are the same. If
white-space changes are ignored they can differ, though. The
new text after applying the diff is more interesting in that case,
so show that instead of the old contents.
Note: GNU diff shows the pre-image.
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Normally it doesn't matter if we show the pre-image or th post-image
for the common parts of a diff because they are the same. If
white-space changes are ignored they can differ, though. The
new text after applying the diff is more interesting in that case,
so show that instead of the old contents.
Note: GNU diff shows the pre-image.
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t4015-diff-whitespace.sh | diff | blob | history | |
xdiff/xemit.c | diff | blob | history |