Git Encontre arquivos com conflitos, listar arquivos com conflito
git diff --name-only --diff-filter=U
Sparkling Sloth
git diff --name-only --diff-filter=U