| commit | b9ebb659268ae1ecf742dff6261e87f4ee57dde7 | |
| author | Richard Hansen <hansenr@google.com> | |
| Tue, 10 Jan 2017 20:42:00 +0000 (10 15:42 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 10 Jan 2017 21:22:20 +0000 (10 13:22 -0800) | ||
| tree | 441c118c949bc8f2f54bb6f0aa5fc110551ec478 | treesnapshot (tar.gz zip) |
| parent | bd9714f2533e8264422811098d0e1b13134094e9 | commitdiff |
t7610: add test case for rerere+mergetool+subdir bug
If rerere is enabled and mergetool is run from a subdirectory,
mergetool always prints "No files need merging". Add an expected
failure test case for this situation.
Signed-off-by: Richard Hansen <hansenr@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If rerere is enabled and mergetool is run from a subdirectory,
mergetool always prints "No files need merging". Add an expected
failure test case for this situation.
Signed-off-by: Richard Hansen <hansenr@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7610-mergetool.sh | diffblobblamehistory |