Revision b12d04503b0aba1f2d68b164b348cbf94bbe570b authored by David Aguilar on 16 October 2014, 04:45:14 UTC, committed by Junio C Hamano on 16 October 2014, 18:58:11 UTC
Older versions of meld listed --output in `meld --help`. Newer versions only mention `meld [OPTIONS...]`. Improve the checks to catch these newer versions. Add a `mergetool.meld.hasOutput` configuration to allow overriding the heuristic. Reported-by: Andrey Novoseltsev <novoselt@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 3c2dc76
| File | Mode | Size |
|---|---|---|
| static | ||
| INSTALL | -rw-r--r-- | 14.4 KB |
| Makefile | -rw-r--r-- | 5.5 KB |
| README | -rw-r--r-- | 2.3 KB |
| gitweb.perl | -rwxr-xr-x | 245.7 KB |
Computing file changes ...
