aboutsummaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2011-08-19 02:14:45 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-19 10:52:16 -0700
commitf61bd9c68a4ed81afcc1fbbf5b956e781d88b434 (patch)
tree6a9afd90a246d7e66f5d7ff4c6abdd853bc573ea /COPYING
parentbc7a96a8965d4ce0651689301e1702a942dfb9f0 (diff)
downloadgit-f61bd9c68a4ed81afcc1fbbf5b956e781d88b434.tar.gz
git-f61bd9c68a4ed81afcc1fbbf5b956e781d88b434.tar.xz
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>
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions