summaryrefslogtreecommitdiff
path: root/contrib/remote-helpers/git-remote-hg
diff options
context:
space:
mode:
authorLibravatar Antoine Pelisse <apelisse@gmail.com>2013-03-14 22:03:14 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-14 14:43:34 -0700
commitfa04ae0be8cca1291a60bc8a393f9c52d2582089 (patch)
tree425ab927b9cab74bf40cbde081a9141742318dc9 /contrib/remote-helpers/git-remote-hg
parentGit 1.8.2 (diff)
downloadtgif-fa04ae0be8cca1291a60bc8a393f9c52d2582089.tar.xz
Allow combined diff to ignore white-spaces
The combined diff --cc output does not honor options to ignore whitespace changes (-b, -w, and --ignore-space-at-eol). Correct this by passing diff flags to diff engine, so that combined diff behaves as normal diff does with spaces, and by coalescing lines that are removed from both (or more) parents, honoring the same rule to ignore whitespace changes. With this change, a conflict-less merge done using a ignore-* strategy option will not show any conflict if shown in combined-diff using the same option. Signed-off-by: Antoine Pelisse <apelisse@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/remote-helpers/git-remote-hg')
0 files changed, 0 insertions, 0 deletions