Pokaż pliki Conflcited

git diff --name-only --diff-filter=U
Outrageous Ox