Created
June 5, 2009 18:49
-
-
Save pratul/124430 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 merge new | |
| Renaming vodown.info->vud.info | |
| Auto-merging vud.info | |
| CONFLICT (rename/delete): Rename vodown.install->vud.install in HEAD and deleted in new | |
| CONFLICT (rename/delete): Rename vodown.module->vud.module in HEAD and deleted in new | |
| Auto-merging .gitignore | |
| CONFLICT (add/add): Merge conflict in .gitignore | |
| CONFLICT (delete/modify): vud_comments/CVS/Entries deleted in HEAD and modified in new. Version new of vud_comments/CVS/Entries left in tree. | |
| Automatic merge failed; fix conflicts and then commit the result. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment