Git Mergtool: No files need merging + git status all conflicts fixed

Question

Recently my mergetool has been acting up any merge that has conflicts mergetool will report no files need merging and git status shows all conflicts are fixed. When they in fact are not.

Here is my global .gitconfig:

[core]
        excludesfile = /Users/xxx/.gitignore_global
        trustctime = false
[merge]
        tool = kdiff3
        conflictstyle = diff3
[mergetool]
        trustExitCode = true 

Answer 1

Instead of trying to figure out the root cause, I now mark all files as unresolved and do git mergetool