From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Jun 2015 19:45:14 +0000 (-0700)
Subject: Merge branch 'da/mergetool-winmerge'
X-Git-Tag: v2.5.0-rc0~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=324a9f41cbf96ad994efc3b20be239116eba0dae;p=thirdparty%2Fgit.git

Merge branch 'da/mergetool-winmerge'

"git mergetool" learned to drive WinMerge as a backend.

* da/mergetool-winmerge:
  mergetools: add winmerge as a builtin tool
  mergetool--lib: set IFS for difftool and mergetool
---

324a9f41cbf96ad994efc3b20be239116eba0dae