Merge branch 'da/mergetool-winmerge'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Jun 2015 19:45:14 +0000 (12:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Jun 2015 19:45:14 +0000 (12:45 -0700)
commit324a9f4...cbf96ad994efc3b20be239116eba0dae
tree496fc12...58b69d8795315049e89a6dbb0737471acopy hash to clipboard (tree)
parent1fd63ca...50ea2ea95bb217a45c72084af3353d4fcopy hash to clipboard (diff)
parent3e4f237...b295e19dbc1a6bd0e743f65b500b7bdacopy hash to clipboard (diff)