Created
May 27, 2009 07:28
-
-
Save cxreg/118505 to your computer and use it in GitHub Desktop.
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
| count@bokonon:~/foobar/foo$ ls .git/MERGE_* | |
| .git/MERGE_HEAD .git/MERGE_MODE .git/MERGE_MSG | |
| count@bokonon:~/foobar/foo$ git pull | |
| Already up-to-date. | |
| count@bokonon:~/foobar/foo$ ls .git/MERGE_* | |
| ls: cannot access .git/MERGE_*: No such file or directory |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment