The unified diff between revisions [2df88abf..] and [818e3621..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'cmd_merging.cc'

#
#
# patch "cmd_merging.cc"
#  from [8d21eaac383395a04ac97f4e96f110cd869ebe5c]
#    to [77e6ad94c66cee990213f8ed8cbd8c8324acf2b4]
#
============================================================
--- cmd_merging.cc	8d21eaac383395a04ac97f4e96f110cd869ebe5c
+++ cmd_merging.cc	77e6ad94c66cee990213f8ed8cbd8c8324acf2b4
@@ -99,11 +99,7 @@ pick_branch_for_update(options & opts, d
   set< branch_name > branches;
   for (vector< revision<cert> >::const_iterator i = certs.begin();
        i != certs.end(); i++)
-    {
-      cert_value b;
-      decode_base64(i->inner().value, b);
-      branches.insert(branch_name(b()));
-    }
+    branches.insert(branch_name(i->inner().value()));

   if (branches.find(opts.branchname) != branches.end())
     {