Montrez tous les conflits actuels sur Git
git diff --name-only --diff-filter=U
Sparkling Sloth
git diff --name-only --diff-filter=U