Merge branch 'js/difftool-builtin'
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:15:00 +0000 (13:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:15:00 +0000 (13:15 -0800)
commitb7786bb...b09463641f3e39eca18aefc630ee4f38
tree63238e1...1abb3839d670e50a39b8da7ceb1fe2f7copy hash to clipboard (tree)
parent6ad8b8e...8faa5a301a98a2997da162dea060672ecopy hash to clipboard (diff)
parent94d3997...cc09f36d17b9ad4b49c4709885e300f7copy hash to clipboard (diff)
Makefile
contrib/examples/git-difftool.perl
git.c
t/t7800-difftool.sh