git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a46af59 b12d045)
Merge branch 'da/mergetool-meld'
authorJunio C Hamano <redacted>
Tue, 21 Oct 2014 20:28:47 +0000 (13:28 -0700)
committerJunio C Hamano <redacted>
Tue, 21 Oct 2014 20:28:48 +0000 (13:28 -0700)
commit48f662dd74ed9e909a8ba878152f88a238a97b4f
treee938529a6ffce93a8d24273b98ff517d2788456ftree | snapshot
parenta46af5946c3ec125e0c2fee889610485eb4a6e14commit | diff
parentb12d04503b0aba1f2d68b164b348cbf94bbe570bcommit | diff
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
Documentation/config.txt diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT