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 |
|---|---|---|
| LICENSE | -rw-r--r-- | 1.5 KB |
| fast_export.c | -rw-r--r-- | 8.9 KB |
| fast_export.h | -rw-r--r-- | 1.2 KB |
| line_buffer.c | -rw-r--r-- | 2.8 KB |
| line_buffer.h | -rw-r--r-- | 980 bytes |
| line_buffer.txt | -rw-r--r-- | 2.4 KB |
| repo_tree.c | -rw-r--r-- | 1.0 KB |
| repo_tree.h | -rw-r--r-- | 692 bytes |
| sliding_window.c | -rw-r--r-- | 2.1 KB |
| sliding_window.h | -rw-r--r-- | 376 bytes |
| svndiff.c | -rw-r--r-- | 8.0 KB |
| svndiff.h | -rw-r--r-- | 210 bytes |
| svndump.c | -rw-r--r-- | 13.4 KB |
| svndump.h | -rw-r--r-- | 267 bytes |
Computing file changes ...
