This write-up is deep and super comprehensive:
https://www.eseth.org/2020/mergetools.html
`git config mergetool.hideResolved true` enables the modern git mergetool behavior.
This write-up is deep and super comprehensive:
https://www.eseth.org/2020/mergetools.html
`git config mergetool.hideResolved true` enables the modern git mergetool behavior.