gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Commands - merge

Browse Source 
- Migrated handleMerge to CmdMerge.
This commit is contained in:
Paul Beckingham
2011-05-30 14:45:39 -04:00
parent af90a14cb5
commit 510ce650a6
9 changed files with 153 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands/Command.cpp
View File

@@ -53,6 +53,7 @@
#include <CmdInstall.h>
#include <CmdLog.h>
#include <CmdLogo.h>
#include <CmdMerge.h>
#include <CmdPrepend.h>
#include <CmdProjects.h>
#include <CmdPull.h>
@@ -114,6 +115,7 @@ void Command::factory (std::map <std::string, Command*>& all)
c = new CmdInstall (); all[c->keyword ()] = c;
c = new CmdLog (); all[c->keyword ()] = c;
c = new CmdLogo (); all[c->keyword ()] = c;
c = new CmdMerge (); all[c->keyword ()] = c;
c = new CmdPrepend (); all[c->keyword ()] = c;
c = new CmdProjects (); all[c->keyword ()] = c;
c = new CmdPull (); all[c->keyword ()] = c;