From 562eed6a39f2ca73144bed35187066e8bad837ab Mon Sep 17 00:00:00 2001
From: Mike Francis <mikeffrancis@gmail.com>
Date: Wed, 20 Apr 2016 10:43:53 +0100
Subject: [PATCH] Added alias for getting files with merge conflicts

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 95ce1ae26..181456711 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -82,6 +82,7 @@ alias gdt='git diff-tree --no-commit-id --name-only -r'
 gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff
 alias gdw='git diff --word-diff'
+alias gdmc='git diff --name-only --diff-filter=U'
 
 alias gf='git fetch'
 alias gfa='git fetch --all --prune'