diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-05-31 17:35:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-31 17:35:20 -0700 |
| commit | 7b3bdbb335b6be938b4748e86a41357e51c97804 (patch) | |
| tree | 06ebfd196fa75f0e8cc1bbc23449b60807f824ba /t/t7610-mergetool.sh | |
| parent | tests: use "test_cmp", not "diff", when verifying the result (diff) | |
| download | tgif-7b3bdbb335b6be938b4748e86a41357e51c97804.tar.xz | |
fixup: do not unconditionally disable "diff -u"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions