Andrew's git / gitweb.git / diff
?
Merge branch 'da/mergetool-meld'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Oct 2014 20:28:47 +0000 (13:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Oct 2014 20:28:48 +0000 (13:28 -0700)
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

No differences found