summaryrefslogtreecommitdiff
path: root/mergetools/gvimdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-11-02 13:17:38 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-02 13:17:38 -0800
commitd5c2d1a0aad8ef59c83d801e6cf378dc8b312f8b (patch)
tree313d88c875df02a33d69ce209d718ff1aadf7467 /mergetools/gvimdiff
parentMerge branch 'jk/fast-import-marks-alloc-fix' (diff)
parentRevert "test_cmp: diagnose incorrect arguments" (diff)
downloadtgif-d5c2d1a0aad8ef59c83d801e6cf378dc8b312f8b.tar.xz
Merge branch 'es/test-cmp-typocatcher'
A test helper "test_cmp A B" was taught to diagnose missing files A or B as a bug in test, but some tests legitimately wanted to notice a failure to even create file B as an error, in addition to leaving the expected result in it, and were misdiagnosed as a bug. This has been corrected. * es/test-cmp-typocatcher: Revert "test_cmp: diagnose incorrect arguments"
Diffstat (limited to 'mergetools/gvimdiff')
0 files changed, 0 insertions, 0 deletions