Created
May 1, 2018 13:33
-
-
Save jinwood/8926902b99c7f49b687b861bfe0ef433 to your computer and use it in GitHub Desktop.
This file contains hidden or 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
| #View all conflicts in merge | |
| 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