#
#
# patch "cmd_merging.cc"
#  from [d0cda85b132150409d50526aa1d38c001932866d]
#    to [51a0a0b068a90ba61db198b4e643f8016d1ce781]
#
============================================================
--- cmd_merging.cc	d0cda85b132150409d50526aa1d38c001932866d
+++ cmd_merging.cc	51a0a0b068a90ba61db198b4e643f8016d1ce781
@@ -25,6 +25,7 @@
 #include "ui.hh"
 #include "app_state.hh"
 #include "simplestring_xform.hh"
+#include "keys.hh"
 
 using std::cout;
 using std::make_pair;
@@ -322,6 +323,12 @@ merge_two(revision_id const & left, revi
       P(F("[left]  %s") % left);
       P(F("[right] %s") % right);
     }
+
+  {
+    // early short-circuit to avoid failure after lots of work
+    rsa_keypair_id key;
+    get_user_key(key,app);
+  }
   
   revision_id merged;
   transaction_guard guard(app.db);