#
#
# patch "cmd_merging.cc"
#  from [288f34e02f141afbb5a9c97e9d20f85fe8f84fff]
#    to [2a894c50a186ada338d5b1f645ca981b0677dd51]
#
============================================================
--- cmd_merging.cc	288f34e02f141afbb5a9c97e9d20f85fe8f84fff
+++ cmd_merging.cc	2a894c50a186ada338d5b1f645ca981b0677dd51
@@ -1054,7 +1054,7 @@ CMD(store, "store", "", CMD_REF(conflict
     options::opts::branch | options::opts::conflicts_opts)
 {
   database    db(app);
-  project_t   project(db);
+  project_t   project(db, app.lua, app.opts);
   revision_id left_id, right_id;
 
   get_conflicts_rids(args, db, project, app, left_id, right_id);
@@ -1083,7 +1083,7 @@ CMD_AUTOMATE(file_merge, N_("LEFT_REVID 
     F("wrong argument count"));
 
   database  db(app);
-  project_t project(db);
+  project_t project(db, app.lua, app.opts);
 
   revision_id left_rid;
   complete(app.opts, app.lua, project, idx(args,0)(), left_rid);