diff --git a/aliases.sh b/aliases.sh
index 14787a62c..4d5675598 100644
--- a/aliases.sh
+++ b/aliases.sh
@@ -21,6 +21,7 @@ command -v tmux >/dev/null && alias tls='tmux list-sessions' || \
 # git-specific aliases
 git config --global alias.recent 'for-each-ref --count=10 --sort=-committerdate refs/heads/ --format="%(refname:short)"'
 git config --global alias.today 'log --since=00:00:00 --all --no-merges --oneline --author="$(git config --get user.email)"'
+git config --global alias.conflicts 'diff --name-only --diff-filter=U'
 
 alias glp="git log --graph --pretty=format:'%Cred%h%Creset -%Cblue %an %Creset - %C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
 alias gprom="git pull --rebase origin master"
diff --git a/configs/shared/.gitconfig b/configs/shared/.gitconfig
index 4404e8278..cd33cfa01 100644
--- a/configs/shared/.gitconfig
+++ b/configs/shared/.gitconfig
@@ -6,6 +6,7 @@
 	recent = for-each-ref --count=10 --sort=-committerdate refs/heads/ --format=\"%(refname:short)\"
 	today = log --since=00:00:00 --all --no-merges --oneline --author=\"$(git config --get user.email)\"
 	changed-files = 
+	conflicts = diff --name-only --diff-filter=U
 [commit]
 	gpgsign = true
 [gpg]