Andrew's git / gitweb.git / diff
?
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)
Hotfix for an earlier change already in 'master' that broke the
default tool selection for mergetool.

* da/mergetool-winmerge:
mergetool-lib: fix default tool selection

Trivial merge