Merge branch 'dl/difftool-mergetool'
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 May 2019 07:45:30 +0000 (16:45 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 May 2019 07:45:30 +0000 (16:45 +0900)
commit85ac27e...4fd0cf1d086028e87f69ffb498c1451b
treee4486ed...9a0d92509bb49a6435e7cb126be6bf99copy hash to clipboard (tree)
parentfed9391...ba44417d6d6559795c0f0194882f12c1copy hash to clipboard (diff)
parent6c22d71...e7b4067a6865ff3fbceab991d0042c12copy hash to clipboard (diff)
builtin/difftool.c
git-mergetool--lib.sh
t/t7800-difftool.sh