Merge branch 'da/mergetool-diff-order'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Oct 2016 20:25:21 +0000 (13:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Oct 2016 20:25:21 +0000 (13:25 -0700)
commit5b4c45a...0cb5cea7b26e2fb5464038f7663f5800
treea432ea1...fa1549f73151b6d1c7b39fef8caf1f4ecopy hash to clipboard (tree)
parent69e6544...98892a2bd3c785cd238c786da40cf6a3copy hash to clipboard (diff)
parent654311b...6ee0fbf530c088271c2c76d46f31f82dcopy hash to clipboard (diff)