mcgraths
1/5/2015 - 8:41 PM

Get a list of conflicted files

Get a list of conflicted files

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