git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bd9714f)
t7610: add test case for rerere+mergetool+subdir bug
authorRichard Hansen <redacted>
Tue, 10 Jan 2017 20:42:00 +0000 (15:42 -0500)
committerJunio C Hamano <redacted>
Tue, 10 Jan 2017 21:22:20 +0000 (13:22 -0800)
commitb9ebb659268ae1ecf742dff6261e87f4ee57dde7
tree441c118c949bc8f2f54bb6f0aa5fc110551ec478tree | snapshot
parentbd9714f2533e8264422811098d0e1b13134094e9commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t7610-mergetool.sh diff | blob | history
git clone https://git.99rst.org/PROJECT