From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Oct 2014 17:35:16 +0000 (-0700)
Subject: Merge branch 'da/mergetool-meld' into maint
X-Git-Tag: v2.1.3~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9db18387056c713eca8f53bff3bb409d23117f1d;p=thirdparty%2Fgit.git

Merge branch 'da/mergetool-meld' into maint

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

9db18387056c713eca8f53bff3bb409d23117f1d