Show More
@@ -1662,7 +1662,7 b' class localrepository(object):' | |||
|
1662 | 1662 | self.ui.status(" %s%s\n" % (f, cf)) |
|
1663 | 1663 | self.ui.warn(_("aborting update spanning branches!\n")) |
|
1664 | 1664 | self.ui.status(_("(use 'hg merge' to merge across branches" |
|
1665 | " or '-C' to lose changes)\n")) | |
|
1665 | " or 'hg update -C' to lose changes)\n")) | |
|
1666 | 1666 | return 1 |
|
1667 | 1667 | branch_merge = True |
|
1668 | 1668 |
@@ -2,4 +2,4 b' removing b' | |||
|
2 | 2 | this update spans a branch affecting the following files: |
|
3 | 3 | b |
|
4 | 4 | aborting update spanning branches! |
|
5 | (use 'hg merge' to merge across branches or '-C' to lose changes) | |
|
5 | (use 'hg merge' to merge across branches or 'hg update -C' to lose changes) |
@@ -101,7 +101,7 b' this update spans a branch affecting the' | |||
|
101 | 101 | a (resolve) |
|
102 | 102 | b (resolve) |
|
103 | 103 | aborting update spanning branches! |
|
104 | (use 'hg merge' to merge across branches or '-C' to lose changes) | |
|
104 | (use 'hg merge' to merge across branches or 'hg update -C' to lose changes) | |
|
105 | 105 | failed |
|
106 | 106 | abort: outstanding uncommitted changes |
|
107 | 107 | failed |
General Comments 0
You need to be logged in to leave comments.
Login now