Alexander Gavrilov 5e568f9e30 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>

2008-08-23 23:59:20 -07:00

27 KiB

Raw Blame History

View Raw