hg

--- a/hg	Fri May 20 17:46:47 2005 -0800
+++ b/hg	Fri May 20 17:47:13 2005 -0800
@@ -407,13 +407,6 @@
             r = "?"
         print "%-30s %5d:%s" % (k, repo.changelog.rev(n), hg.hex(n))
 
-elif cmd == "debugoldmerge":
-    if args:
-        other = hg.repository(ui, args[0])
-        repo.merge(other)
-    else:
-        print "missing source repository"
-
 elif cmd == "verify":
     filelinkrevs = {}
     filenodes = {}