X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=mergetools%2Fmeld;h=cb672a55192cb44335aa2cbe1f10004bb26d86ff;hb=508d1244dc8d38188c70e98207efa8a97d16b47c;hp=eaa115ccb7a1154715c1d9dd9b7d4d360234aa01;hpb=9b0b0b4f45bc3d2f12391fe0dd4eaef81db97295;p=git.git

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