mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-07-07 20:06:36 +02:00
Merge
- Fixed merge, with an egregious hack for now, by creating zero-byte undo.data file. This goes against the whole TDB2 philosophy, so it is temporary. - Updated PUNCHLIST. - Removed old tdb comment from CmdMerge.
This commit is contained in:
parent
dcd0bd1de7
commit
87df2f66ec
3 changed files with 4 additions and 2 deletions
|
@ -97,7 +97,6 @@ int CmdMerge::execute (std::string& output)
|
|||
|| (bAutopush) )
|
||||
{
|
||||
// TODO derive autopush uri from merge.default.uri? otherwise: change prompt above
|
||||
// context.task.set ("description", uri._data);
|
||||
|
||||
std::string out;
|
||||
context.commands["push"]->execute (out);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue