#
#
# patch "cmd_files.cc"
#  from [b10aef51c669d7d51136c0a95f340b5fe4df3820]
#    to [2395edc608207e4c96ff2ebc7c02ca2fc318577b]
#
============================================================
--- cmd_files.cc	b10aef51c669d7d51136c0a95f340b5fe4df3820
+++ cmd_files.cc	2395edc608207e4c96ff2ebc7c02ca2fc318577b
@@ -60,9 +60,9 @@ CMD(fmerge, "fmerge", "", CMD_REF(debug)
     throw usage(execid);
 
   file_id 
-    anc_id(idx(args, 0)()), 
-    left_id(idx(args, 1)()), 
-    right_id(idx(args, 2)());
+    anc_id(decode_hexenc(idx(args, 0)())), 
+    left_id(decode_hexenc(idx(args, 1)())), 
+    right_id(decode_hexenc(idx(args, 2)()));
 
   file_data anc, left, right;
 
@@ -103,8 +103,8 @@ CMD(fdiff, "fdiff", "", CMD_REF(debug), 
     & dst_name = idx(args, 1)();
 
   file_id 
-    src_id(idx(args, 2)()), 
-    dst_id(idx(args, 3)());
+    src_id(decode_hexenc(idx(args, 2)())),
+    dst_id(decode_hexenc(idx(args, 3)()));
 
   file_data src, dst;