Show More
@@ -356,11 +356,6 b' elif cmd == "debugindexdot":' | |||
|
356 | 356 | print "}" |
|
357 | 357 | |
|
358 | 358 | elif cmd == "merge": |
|
359 | (c, a, d, u) = repo.diffdir(repo.root, repo.current) | |
|
360 | if c or a or d: | |
|
361 | ui.warn("aborting (outstanding changes in working directory)\n") | |
|
362 | sys.exit(1) | |
|
363 | ||
|
364 | 359 | if args: |
|
365 | 360 | paths = {} |
|
366 | 361 | try: |
General Comments 0
You need to be logged in to leave comments.
Login now