From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 14 Mar 2021 23:01:41 +0000 (-0700)
Subject: Merge branch 'jn/mergetool-hideresolved-is-optional'
X-Git-Tag: v2.31.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8775279891fd186ce847b7ddb7f0ac2339504300;p=thirdparty%2Fgit.git

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

8775279891fd186ce847b7ddb7f0ac2339504300