Merge

- Added support for URIs - Added push command (pushes *.data to remote location) - Added config option: merge.autopush
2010-09-02 01:26:55 +02:00
parent d362088305
commit 869655e818
8 changed files with 85 additions and 5 deletions
--- a/src/main.h
+++ b/src/main.h
@@ -78,6 +78,7 @@ int handleDenotate (std::string &);
 int handleDuplicate (std::string &);
 void handleUndo ();
 void handleMerge (std::string&);
+void handlePush (std::string&);
 #ifdef FEATURE_SHELL
 void handleShell ();
 #endif