#
#
# patch "cmd_merging.cc"
#  from [6958aa7d06cccb45557d7bab875ea7138c7f776b]
#    to [cd645a393a9f8133b3a904245d6f349cbf39d39a]
#
============================================================
--- cmd_merging.cc	6958aa7d06cccb45557d7bab875ea7138c7f776b
+++ cmd_merging.cc	cd645a393a9f8133b3a904245d6f349cbf39d39a
@@ -587,6 +587,10 @@ CMD(merge_into_dir, "merge_into_dir", ""
         content_merge_database_adaptor 
           dba(app, left_rid, right_rid, left_marking_map);
 
+        {
+          rsa_keypair_id key;
+          get_user_key(key, app);
+        }
         resolve_merge_conflicts(left_roster, right_roster,
                                 result, dba, app);