mergetool: fix running in subdir when rerere enabled
authorRichard Hansen <hansenr@google.com>
Tue, 10 Jan 2017 20:42:02 +0000 (15:42 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Jan 2017 21:22:51 +0000 (13:22 -0800)
commitd0e0cfe...45e0c88ca2f4d4ed9f1d2871b659d872
tree8333fea...1498b202eda76db1ff77e0bc3c3cb5f1copy hash to clipboard (tree)
parentc1b0d3a...10eaed0d7683fe0593132f2211467b20copy hash to clipboard (diff)
git-mergetool.sh
t/t7610-mergetool.sh