Re: [PATCH] mergetools/meld: do not rely on the output of `meld --help`

2014-10-15 Thread Junio C Hamano
Junio C Hamano writes: > This obviously breaks those who have happily been using their > installed version of meld that understands and shows --output in the > help text. Is that a minority that is rapidly diminishing? > > I would understand it if the change were > > - a configuration tells us

Re: [PATCH] mergetools/meld: do not rely on the output of `meld --help`

2014-10-15 Thread Junio C Hamano
David Aguilar writes: > We cannot rely on the output of `meld --help` when determining > whether or not meld understands the --output option. > > Newer versions of meld print a generic help message that does not > mention --output even though it is supported. This obviously breaks those who have

[PATCH] mergetools/meld: do not rely on the output of `meld --help`

2014-10-15 Thread David Aguilar
We cannot rely on the output of `meld --help` when determining whether or not meld understands the --output option. Newer versions of meld print a generic help message that does not mention --output even though it is supported. Add a mergetool.meld.compat variable to enable the historical behavio