Commands - merge

- Migrated handleMerge to CmdMerge.
2011-05-30 14:45:39 -04:00
parent af90a14cb5
commit 510ce650a6
9 changed files with 153 additions and 70 deletions
--- a/src/commands/CMakeLists.txt
+++ b/src/commands/CMakeLists.txt
@@ -31,6 +31,7 @@ set (commands_SRCS Command.cpp        Command.h
                   CmdInstall.cpp     CmdInstall.h
                   CmdLog.cpp         CmdLog.h
                   CmdLogo.cpp        CmdLogo.h
+                   CmdMerge.cpp       CmdMerge.h
                   CmdPrepend.cpp     CmdPrepend.h
                   CmdProjects.cpp    CmdProjects.h
                   CmdPull.cpp        CmdPull.h