Show More
@@ -1544,7 +1544,7 b' def update(repo, node, branchmerge, forc' | |||
|
1544 | 1544 | raise error.Abort(_("merging with a working directory ancestor" |
|
1545 | 1545 | " has no effect")) |
|
1546 | 1546 | elif pas == [p1]: |
|
1547 |
if not mergeancestor and |
|
|
1547 | if not mergeancestor and wc.branch() == p2.branch(): | |
|
1548 | 1548 | raise error.Abort(_("nothing to merge"), |
|
1549 | 1549 | hint=_("use 'hg update' " |
|
1550 | 1550 | "or check 'hg heads'")) |
General Comments 0
You need to be logged in to leave comments.
Login now