Merge branch 'da/mergetool-winmerge'
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Jul 2015 21:02:30 +0000 (14:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Jul 2015 21:02:30 +0000 (14:02 -0700)
commita225a26...1014bf06ddba932c9dab6cc299ab5239
treeb74f424...740b0e197707e3eacf161e111cad5513copy hash to clipboard (tree)
parent912bd49...e93f0235a5999a77f8d54f5ff80a3a03copy hash to clipboard (diff)
parentf67986b...098c21005f33182472a990d5c6e8a98dcopy hash to clipboard (diff)