Created
July 14, 2010 19:34
-
-
Save zellyn/475919 to your computer and use it in GitHub Desktop.
I figured if I got one, I probably got the other too. Richard has a better way though: there's a git command that checks for unmerged files (among other things).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Probably need to cover <<<<<<< as well?