git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 074d162 5320406)
Merge branch 'jn/mergetool-hideresolved-is-optional'
authorJunio C Hamano <redacted>
Sun, 14 Mar 2021 23:01:41 +0000 (16:01 -0700)
committerJunio C Hamano <redacted>
Sun, 14 Mar 2021 23:01:41 +0000 (16:01 -0700)
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


Trivial merge
git clone https://git.99rst.org/PROJECT