From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 1 Jul 2015 21:02:30 +0000 (-0700)
Subject: Merge branch 'da/mergetool-winmerge'
X-Git-Tag: v2.5.0-rc1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a225a2601014bf06ddba932c9dab6cc299ab5239;p=thirdparty%2Fgit.git

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
---

a225a2601014bf06ddba932c9dab6cc299ab5239