summaryrefslogtreecommitdiff
path: root/mergetools/meld
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/meld')
-rw-r--r--mergetools/meld2
1 files changed, 1 insertions, 1 deletions
diff --git a/mergetools/meld b/mergetools/meld
index eaa115ccb7..cb672a5519 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