Created
July 27, 2013 12:05
-
-
Save rin/6094682 to your computer and use it in GitHub Desktop.
Open files with merge conflict in your editor.
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 status -s | grep ^UU | cut -f2 -d " " | xargs $EDITOR |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment