pratul

.gitignore: needs merge
vud.install: needs merge
vud.module: needs merge
vud_comments/CVS/Entries: needs merge
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	unmerged:   .gitignore
#	unmerged:   vud.install

pratul

>: 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.