Created
November 5, 2013 17:05
-
-
Save matiasherranz/7322372 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
| git config --global alias.conflicts "diff --name-only --diff-filter=U" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment