Feature - merge command

- Merged patch that implements the first milestone of the merge feature. Thanks to Johannes Schlatow.
2010-07-01 20:22:33 -04:00
parent d7c446f010
commit 213a7a519b
12 changed files with 800 additions and 10 deletions
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -240,6 +240,7 @@ int Context::dispatch (std::string &out)
  else if (cmd.command == "shell")            {      handleShell                 (   ); }
 #endif
  else if (cmd.command == "undo")             {      handleUndo                  (   ); }
+  else if (cmd.command == "_merge")           {      handleMerge                 (out); }
  else if (cmd.command == "_projects")        { rc = handleCompletionProjects    (out); }
  else if (cmd.command == "_tags")            { rc = handleCompletionTags        (out); }
  else if (cmd.command == "_commands")        { rc = handleCompletionCommands    (out); }