Merge branch 'js/difftool-builtin'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Apr 2017 06:29:34 +0000 (23:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Apr 2017 06:29:34 +0000 (23:29 -0700)
commit7b612c9...6ec3ee68fb60410db06222b7d728f965
treeb8499e5...fa7927424abde334f2150524e3210389copy hash to clipboard (tree)
parentc8a8951...e56e497775784babb025e0c26a889f7ccopy hash to clipboard (diff)
parent882add1...6fa8319832ef373b8797ef58edb80efccopy hash to clipboard (diff)