Revert "Let git merge conflict count reflect the number of conflicts, not just the number of conflicting files"

The git merge gives no guarantees about the exit code (contrary to git merge-file)

This reverts commit 98e77491.