List merge conflicts with GIT

Made a merge, particularly, a big one and you want to know which where the files that had conflicts?

Then, this command might come handy:

diff --name-only --diff-filter=U

view raw gistfile1.sh hosted with ❤ by GitHub

You can also make a GIT alias this way:

git config --global alias.conflicts "diff --name-only --diff-filter=U"

view raw gistfile1.sh hosted with ❤ by GitHub

and then use it like this:

git conflicts

view raw gistfile1.sh hosted with ❤ by GitHub