| commit | f61bd9c68a4ed81afcc1fbbf5b956e781d88b434 | |
| author | David Aguilar <davvid@gmail.com> | |
| Fri, 19 Aug 2011 09:14:45 +0000 (19 02:14 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Aug 2011 17:52:16 +0000 (19 10:52 -0700) | ||
| tree | 6a9afd90a246d7e66f5d7ff4c6abdd853bc573ea | treesnapshot (tar.gz zip) |
| parent | bc7a96a8965d4ce0651689301e1702a942dfb9f0 | commitdiff |
mergetools/meld: Use '--output' when available
meld 1.5.0 and newer allow the output file to be specified
when merging multiple files. Check whether the meld command
supports '--output' and use it when available.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
meld 1.5.0 and newer allow the output file to be specified
when merging multiple files. Check whether the meld command
supports '--output' and use it when available.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| mergetools/meld | diffblobblamehistory |