mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'jn/ancient-meld-support'
* jn/ancient-meld-support: mergetools/meld: Use --help output to detect --output support
This commit is contained in:
commit
746b6fb968
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue