--- a/hg	Fri Jun 03 12:44:01 2005 -0800
+++ b/hg	Fri Jun 03 12:45:04 2005 -0800
@@ -356,11 +356,6 @@
     print "}"
 
 elif cmd == "merge":
-    (c, a, d, u) = repo.diffdir(repo.root, repo.current)
-    if c or a or d:
-        ui.warn("aborting (outstanding changes in working directory)\n")
-        sys.exit(1)
-
     if args:
         paths = {}
         try: