Andrew's git / gitweb.git / diff
?
Merge branch 'da/mergetool-meld' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Oct 2014 17:35:16 +0000 (10:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Oct 2014 17:35:16 +0000 (10:35 -0700)
* da/mergetool-meld:
mergetools/meld: make usage of `--output` configurable and more robust

Trivial merge