]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 912bd49 f67986b)
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
Unnamed repository; edit this file 'description' to name the repository.