Created
March 11, 2014 14:39
-
-
Save Ikke/9487136 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-test-conflict :: (master*) » git mergetool ~/tmp/git-test-conflict | |
| Merging: | |
| foo | |
| Normal merge conflict for 'foo': | |
| {local}: modified file | |
| {remote}: modified file | |
| Hit return to start merge resolution tool (vimdiff): | |
| 4 files to edit |
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-test-conflict :: (master*) » ls | |
| foo foo.BACKUP.4170 foo.BASE.4170 foo.LOCAL.4170 foo.REMOTE.4170 mergetool.txt |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment