From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Oct 2014 20:28:47 +0000 (-0700)
Subject: Merge branch 'da/mergetool-meld'
X-Git-Tag: v2.2.0-rc0~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48f662dd74ed9e909a8ba878152f88a238a97b4f;p=git

Merge branch 'da/mergetool-meld'

Newer versions of 'meld' breaks the auto-detection we use to see if
they are new enough to support the `--output` option.

* da/mergetool-meld:
  mergetools/meld: make usage of `--output` configurable and more robust
---

48f662dd74ed9e909a8ba878152f88a238a97b4f