davidmaneuver of Maneuver
5/4/2018 - 8:16 AM

Get list of conflicted files in local repo

git-cmd.sh
content_copyfile_download
git diff --name-only --diff-filter=U