mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-07 16:36:13 +02:00
Code

Merge branch 'jn/ancient-meld-support' into maint 

* jn/ancient-meld-support:
  mergetools/meld: Use --help output to detect --output support
This commit is contained in:
Junio C Hamano 2012-02-27 15:33:07 -08:00
parent 4eed30a7cb 759a904e09
commit bdf26fcbea
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mergetools/meld
View File

@ -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