Rename commands and add CLI help

2021-09-26 13:14:36 +03:00
parent 4319091bd3
commit d5efbbb6b9
5 changed files with 38 additions and 16 deletions
@@ -467,7 +467,7 @@ resume_9:
            exit(1);
        }
        cb = parent->start_merge(json11::Json::object {
-            { "command", json11::Json::array{ "merge", from_name, child_it->second.name } },
+            { "command", json11::Json::array{ "merge-data", from_name, child_it->second.name } },
            { "target", target_it->second.name },
            { "delete-source", false },
            { "cas", use_cas },