diff hg @ 65:d40cc5aacc31 0.4f

Fix up a bunch of bugs in the new merge code Move getchangegroup/addchangegroup to generators
author mpm@selenic.com
date Fri, 13 May 2005 11:47:16 -0800
parents b3e2ddff0159
children a182f2561c8e
line wrap: on
line diff
--- a/hg	Thu May 12 17:54:55 2005 -0800
+++ b/hg	Fri May 13 11:47:16 2005 -0800
@@ -282,7 +282,7 @@
 elif cmd == "merge":
     if args:
         other = hg.repository(ui, args[0])
-        print "retrieving changegroup"
+        print "requesting changegroup"
         cg = repo.getchangegroup(other)
         repo.addchangegroup(cg)
     else: