]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a46af59 b12d045)
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

1  2 
Documentation/config.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/config.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.