Merge branch 'jk/difftool-in-subdir' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:11:08 +0000 (15:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:14:40 +0000 (15:14 -0800)
commita558332...5eda1f9d4cb4abe0e68062c625e5049f
treeafdbb6a...0b0714ddbdf7e67f8ac69f2772d8e780copy hash to clipboard (tree)
parentaa83f7a...a4a677e9eca4a599f47e027ad06716d1copy hash to clipboard (diff)
parentce69269...4ec7b28ad43c387d5aa8ae7ea9f72e65copy hash to clipboard (diff)
git-difftool.perl