aboutsummaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-14 12:57:17 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-14 12:57:17 -0800
commit746b6fb96852accae8a4163f6edda23a4c6de0c7 (patch)
treeadf9a485ba9e9c2a8c6378edba0b7bf652ca5b0b /mergetools
parent63d37c3062e13cb2828edf63bc03cce1b6c41fd0 (diff)
parent759a904e090b56a3941c1133a0f3302b7fec5054 (diff)
downloadgit-746b6fb96852accae8a4163f6edda23a4c6de0c7.tar.gz
git-746b6fb96852accae8a4163f6edda23a4c6de0c7.tar.xz
Merge branch 'jn/ancient-meld-support'
* jn/ancient-meld-support: mergetools/meld: Use --help output to detect --output support
Diffstat (limited to 'mergetools')
-rw-r--r--mergetools/meld2
1 files changed, 1 insertions, 1 deletions
diff --git a/mergetools/meld b/mergetools/meld
index eaa115ccb..cb672a551 100644
--- a/mergetools/meld
+++ b/mergetools/meld
@@ -23,7 +23,7 @@ check_meld_for_output_version () {
meld_path="$(git config mergetool.meld.path)"
meld_path="${meld_path:-meld}"
- if "$meld_path" --output /dev/null --help >/dev/null 2>&1
+ if "$meld_path" --help 2>&1 | grep -e --output >/dev/null
then
meld_has_output_option=true
else