tree 521a06bf41d0afc9881553ddaf8ba8e56a7d1254
parent 074d162eff7487c9e296124510147d3856029f5a
parent 53204061acbf7a03a6ba050f381e0bf9b01e3a78
author Junio C Hamano <gitster@pobox.com> 1615762901 -0700
committer Junio C Hamano <gitster@pobox.com> 1615762901 -0700

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