| commit | a225a2601014bf06ddba932c9dab6cc299ab5239 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Jul 2015 21:02:30 +0000 (1 14:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Jul 2015 21:02:30 +0000 (1 14:02 -0700) | ||
| tree | b74f4243740b0e197707e3eacf161e111cad5513 | treesnapshot (tar.gz zip) |
| parent | 912bd497e93f0235a5999a77f8d54f5ff80a3a03 | commitdiff |
| parent | f67986b9098c21005f33182472a990d5c6e8a98d | commitdiff |
Merge branch 'da/mergetool-winmerge'
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
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