git/Documentation
Junio C Hamano 48f662dd74 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
2014-10-21 13:28:48 -07:00
..
2014-10-21 13:28:48 -07:00
2014-04-08 12:00:28 -07:00
2013-07-22 16:06:48 -07:00
2013-09-04 12:23:25 -07:00
2014-10-16 14:16:42 -07:00
2013-05-29 14:23:04 -07:00
2013-10-18 13:50:12 -07:00
2013-04-12 12:00:52 -07:00
2014-10-16 14:16:42 -07:00
2014-10-10 16:02:26 -07:00