diff --git a/hg b/hg
index 1651a3e619252e8928cd47fa6810ec27d4aea920_aGc=..1536ccac47e90a1850ea8a3f86f2cb9c196f2cc0_aGc= 100644
--- a/hg
+++ b/hg
@@ -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: