Show More
@@ -406,6 +406,11 b' elif cmd == "debugindexdot":' | |||||
406 | print "}" |
|
406 | print "}" | |
407 |
|
407 | |||
408 | elif cmd == "merge": |
|
408 | elif cmd == "merge": | |
|
409 | (c, a, d) = repo.diffdir(repo.root, repo.current) | |||
|
410 | if c: | |||
|
411 | ui.warn("aborting (outstanding changes in working directory)\n") | |||
|
412 | sys.exit(1) | |||
|
413 | ||||
409 | if args: |
|
414 | if args: | |
410 | other = hg.repository(ui, args[0]) |
|
415 | other = hg.repository(ui, args[0]) | |
411 | ui.status("requesting changegroup\n") |
|
416 | ui.status("requesting changegroup\n") |
General Comments 0
You need to be logged in to leave comments.
Login now