View git conflicts (the easy way)

git config --global alias.conflicts '!git ls-files -u | cut -f 2 | sort -u'

And now, simply type git conflicts and you'll get a list of all the conflicts in your repo.