Merge branch 'da/difftool' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Jun 2016 21:27:37 +0000 (14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Jun 2016 21:27:37 +0000 (14:27 -0700)
commit389c328...cfa5bc0a232ad52df70fae1f6863d1a4
tree1509258...a7ff56f43c48ea3718800087277afc6bcopy hash to clipboard (tree)
parent7dcbf89...d975eba5b1e3095cb3b389834689ac09copy hash to clipboard (diff)
parent366f9ce...18fbb7ebb0a75735da8c2a9d5a916809copy hash to clipboard (diff)
t/t7800-difftool.sh