Merge branch 'jn/ancient-meld-support'

* jn/ancient-meld-support: mergetools/meld: Use --help output to detect --output support
2012-02-14 12:57:17 -08:00 · 2012-02-14 12:57:17 -08:00 · 746b6fb968
commit 746b6fb968
parent 63d37c3062 759a904e09
1 changed files with 1 additions and 1 deletions
--- 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