Skip to content
Snippets Groups Projects
Commit 1536ccac47e9 authored by mpm's avatar mpm
Browse files

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-----
parent 1651a3e61925
No related branches found
No related tags found
No related merge requests found
...@@ -356,11 +356,6 @@ ...@@ -356,11 +356,6 @@
print "}" print "}"
elif cmd == "merge": 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: if args:
paths = {} paths = {}
try: try:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment