mergetool: fallback to tool when guitool unavailable
authorDenton Liu <liu.denton@gmail.com>
Mon, 29 Apr 2019 06:21:14 +0000 (02:21 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 May 2019 14:11:59 +0000 (23:11 +0900)
commit60aced3...fa68df60952fed28c4ae63a5bbda0275
treec8b2ed8...040a9627929143e478c4b9ef361d0801copy hash to clipboard (tree)
parent884630b...e2634969656faabc7f4e33cab2e32b35copy hash to clipboard (diff)
Documentation/git-mergetool.txt
git-mergetool--lib.sh
t/t7610-mergetool.sh