Merge branch 'js/mergetool-optim'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:35 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:35 +0000 (15:25 -0700)
commit2950cbd...999e230c985be9f2b40cc0bf787fbdd3
tree59e57aa...f93cd5339052339baf1bf0d077972a43copy hash to clipboard (tree)
parent069874c...e7896f94c6ebd05e437775e45c32caf2copy hash to clipboard (diff)
parent7e6d6f7...10965906d071022615bf64f14c60c0d2copy hash to clipboard (diff)