GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Feature - merge command

Browse source 
- Merged patch that implements the first milestone of the merge
  feature.  Thanks to Johannes Schlatow.
This commit is contained in:
Paul Beckingham 2010-07-01 20:22:33 -04:00
parent d7c446f010
commit 213a7a519b
12 changed files with 800 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main.h
View file

@ -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