diff options
| author | Richard Hansen <hansenr@google.com> | 2017-01-10 15:42:00 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-10 13:22:20 -0800 |
| commit | b9ebb659268ae1ecf742dff6261e87f4ee57dde7 (patch) | |
| tree | 441c118c949bc8f2f54bb6f0aa5fc110551ec478 /git-mergetool.sh | |
| parent | bd9714f2533e8264422811098d0e1b13134094e9 (diff) | |
| download | git-b9ebb659268ae1ecf742dff6261e87f4ee57dde7.tar.gz git-b9ebb659268ae1ecf742dff6261e87f4ee57dde7.tar.xz | |
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>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions