Git 2.56's git add --resolved only checks conflict markers while git still calls a file unmerged

· Dev.to