how to check unsolved conflicts file list in git merge?

how to check unsolved conflicts file list in git merge?

git diff --name-only --diff-filter=U
posted @ 2015-06-04 16:08  世有因果知因求果  阅读(195)  评论(0)  编辑  收藏  举报