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

Merge command

Browse Source 
* Renamed command _merge into merge
This commit is contained in:
Johannes Schlatow
2010-08-07 17:50:02 +02:00
parent b8a3c1b565
commit 7294869d07
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Cmd.cpp
View File

@@ -134,7 +134,6 @@ void Cmd::load ()
commands.push_back ("_ids");
commands.push_back ("_config");
commands.push_back ("_version");
commands.push_back ("_merge");
commands.push_back ("_urgency");
commands.push_back ("export.csv");
commands.push_back ("export.ical");
@@ -174,6 +173,7 @@ void Cmd::load ()
commands.push_back (context.stringtable.get (CMD_TIMESHEET, "timesheet"));
commands.push_back (context.stringtable.get (CMD_UNDO, "undo"));
commands.push_back (context.stringtable.get (CMD_VERSION, "version"));
commands.push_back (context.stringtable.get (CMD_MERGE, "merge"));
// Now load the custom reports.
std::vector <std::string> all;
@@ -264,7 +264,7 @@ bool Cmd::isReadOnlyCommand ()
// Commands that directly modify the data files.
bool Cmd::isWriteCommand ()
{
if (command == "_merge" ||
if (command == context.stringtable.get (CMD_MERGE, "merge") ||
command == context.stringtable.get (CMD_ADD, "add") ||
command == context.stringtable.get (CMD_APPEND, "append") ||
command == context.stringtable.get (CMD_ANNOTATE, "annotate") ||