show all merge conflicts

Hi folks,

I'm trying to determine whether a merge required a conflict to resolve after the merge has occurred. The git book has some advice (https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging) to use `git show` on the merge commit or use `git log --cc -p -1`. These strategies work when the merge conflict was resolved with a change that is different from either parent. When the conflict is resolved with a change that is the same as one of the parents, then these commands are indistinguishable from a merge that did not conflict. Is it possible to distinguish between a conflict-free merge and a merge conflict that is resolved by with the changes from one the parents?

Thanks, --Michael