BartlomiejSkwira
5/24/2013 - 2:47 PM

List conflicted files in Git

List conflicted files in Git

git ls-files -u | cut -f 2 | sort -u

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