summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Wincent Colaiuta <gitster@pobox.com>2007-12-13 14:32:31 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-12-13 23:53:20 -0800
commitf817546652812ad5f20a8ab4a4a7290a9759ac4e (patch)
tree3f3048fdf8668b7404f93be8861fa13488d82d83 /xdiff/xmerge.c
parentMake "diff --check" output match "git apply" (diff)
downloadtgif-f817546652812ad5f20a8ab4a4a7290a9759ac4e.tar.xz
Add tests for "git diff --check" with core.whitespace options
Make sure that "git diff --check" does the right thing when the core.whitespace options are set. While we are at it, correct many uses of test_expect_failure that ran sequence of commands. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions