Git 2.31 mergetool enhancements
Git 2.31 added the ability to maximally resolve the parts of a merge commit, where some parts could not be auto-merged. This workflow isn’t good for some types of project, but a lot of projects and devs use this setting.
Set this globally (it can also be set per-repo and/or per merge tool):
git config --global mergetool.hideResolved true