mergetool-lib: fix default tool selection
authorMichael J Gruber <git@drmicha.warpmail.net>
Fri, 19 Jun 2015 09:30:55 +0000 (11:30 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jun 2015 18:20:52 +0000 (11:20 -0700)
commitf67986b...098c21005f33182472a990d5c6e8a98d
tree4577b8e...d847ceb347313326c5ecbd89138aeff0copy hash to clipboard (tree)
parent3e4f237...b295e19dbc1a6bd0e743f65b500b7bdacopy hash to clipboard (diff)
git-mergetool--lib.sh