Created
October 22, 2012 13:00
-
-
Save gitfoobar/3931401 to your computer and use it in GitHub Desktop.
#git list conflicted files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| git diff --name-only --diff-filter=U |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
see http://stackoverflow.com/questions/3065650/whats-the-simplest-way-to-git-a-list-of-conflicted-files