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/main.h
+++ b/src/main.h
@@ -80,6 +80,7 @@ int handleAnnotate (std::string &);
 int handleDenotate (std::string &);
 int handleDuplicate (std::string &);
 void handleUndo ();
+void handleMerge (std::string&);
 #ifdef FEATURE_SHELL
 void handleShell ();
 #endif