--- a/hg	Thu May 26 22:47:43 2005 -0800
+++ b/hg	Thu May 26 22:54:48 2005 -0800
@@ -406,6 +406,11 @@
     print "}"
 
 elif cmd == "merge":
+    (c, a, d) = repo.diffdir(repo.root, repo.current)
+    if c:
+        ui.warn("aborting (outstanding changes in working directory)\n")
+        sys.exit(1)
+
     if args:
         other = hg.repository(ui, args[0])
         ui.status("requesting changegroup\n")