Mark Chouinard / October 29, 2014 Git – list of conflicted files git diff --name-only --diff-filter=U from SO
