]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 074d162 5320406)
Merge branch 'jn/mergetool-hideresolved-is-optional'
authorJunio C Hamano <gitster@pobox.com>
Sun, 14 Mar 2021 23:01:41 +0000 (16:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Mar 2021 23:01:41 +0000 (16:01 -0700)
commit8775279891fd186ce847b7ddb7f0ac2339504300
tree521a06bf41d0afc9881553ddaf8ba8e56a7d1254tree | snapshot
parent074d162eff7487c9e296124510147d3856029f5acommit | diff
parent53204061acbf7a03a6ba050f381e0bf9b01e3a78commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.