diff --git a/hg b/hg index 8da1df932c16d3cfa29f0f13c89c8adebca659cf_aGc=..23057dc57d1b01b06897e8d89bd6fe81b12c849c_aGc= 100644 --- a/hg +++ b/hg @@ -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")