Mostre todo o conflito atual no git

git diff --name-only --diff-filter=U
Sparkling Sloth