Merge branch 'js/difftool-builtin'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Mar 2017 20:56:00 +0000 (13:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Mar 2017 20:56:00 +0000 (13:56 -0700)
commit0e758ac...a8073983774dee15f1cd3d3b6c4bb5fd
tree24798d9...bc4527d39240971a984a8b9444803dffcopy hash to clipboard (tree)
parent9d77b04...5ce6b471cb5ce3a904368fc25e55643dcopy hash to clipboard (diff)
parent18ec800...12eb0634a0bf5e86b36ed156fbee73f3copy hash to clipboard (diff)