# HG changeset patch
# User mpm@selenic.com
# Date 1117831504 28800
# Node ID 1536ccac47e90a1850ea8a3f86f2cb9c196f2cc0
# Parent  1651a3e619252e8928cd47fa6810ec27d4aea920
merge: don't bail on outstanding changes

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

merge: don't bail on outstanding changes

With multiple heads, we don't need to worry about the working dir's
uncommitted changes at pull time

manifest hash: 5b4e024f220fa616732310ce5f48e71abfa910e0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCoMFQywK+sNU5EO8RApLyAKCoNDF84wFzgnpS+WLuXdkGxeHFPwCdFsMy
CysB458dNcFuB/vDFhgJr58=
=gG+u
-----END PGP SIGNATURE-----


diff -r 1651a3e61925 -r 1536ccac47e9 hg
--- 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: