Merge branch 'js/difftool-builtin'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2017 20:52:25 +0000 (12:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2017 20:52:25 +0000 (12:52 -0800)
commit163d24d...4d914191d1981ed0d9fa2a5d91b7d412
tree99efdce...c601aeca8dbeea4779a39e651c3b46fdcopy hash to clipboard (tree)
parentcf36a4d...3589da2df8ab2101b5c385f12abcd67dcopy hash to clipboard (diff)
parente66adca...fe63508dfd7410c2253116043894d298copy hash to clipboard (diff)
t/t7800-difftool.sh