diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-14 23:01:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-14 23:01:41 (GMT) |
| commit | 8775279891fd186ce847b7ddb7f0ac2339504300 (patch) | |
| tree | 521a06bf41d0afc9881553ddaf8ba8e56a7d1254 /git-mergetool.sh | |
| parent | 074d162eff7487c9e296124510147d3856029f5a (diff) | |
| parent | 53204061acbf7a03a6ba050f381e0bf9b01e3a78 (diff) | |
| download | git-8775279891fd186ce847b7ddb7f0ac2339504300.zip git-8775279891fd186ce847b7ddb7f0ac2339504300.tar.gz git-8775279891fd186ce847b7ddb7f0ac2339504300.tar.bz2 | |
Merge branch 'jn/mergetool-hideresolved-is-optional'
Disable the recent mergetool's hideresolved feature by default for
backward compatibility and safety.
* jn/mergetool-hideresolved-is-optional:
doc: describe mergetool configuration in git-mergetool(1)
mergetool: do not enable hideResolved by default
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index 911470a..f751d9c 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -358,13 +358,8 @@ merge_file () { enabled=false fi else - # The user does not have a preference. Ask the tool. - if hide_resolved_enabled - then - enabled=true - else - enabled=false - fi + # The user does not have a preference. Default to disabled. + enabled=false fi if test "$enabled" = true |