Show More
@@ -1492,7 +1492,8 b' class localrepository:' | |||||
1492 | if f in merge: cf = " (resolve)" |
|
1492 | if f in merge: cf = " (resolve)" | |
1493 | self.ui.status(" %s%s\n" % (f, cf)) |
|
1493 | self.ui.status(" %s%s\n" % (f, cf)) | |
1494 | self.ui.warn("aborting update spanning branches!\n") |
|
1494 | self.ui.warn("aborting update spanning branches!\n") | |
1495 |
self.ui.status("(use update -m to |
|
1495 | self.ui.status("(use update -m to merge across branches" + | |
|
1496 | " or -C to lose changes)\n") | |||
1496 | return 1 |
|
1497 | return 1 | |
1497 | # we have to remember what files we needed to get/change |
|
1498 | # we have to remember what files we needed to get/change | |
1498 | # because any file that's different from either one of its |
|
1499 | # because any file that's different from either one of its |
General Comments 0
You need to be logged in to leave comments.
Login now