How to list unmerged files during a GIT conflict

Add this to your list of aliases:

alias gunmerged='git diff --name-only --diff-filter=U'

gunmerged will show you the unmerged files.