Show More
@@ -467,7 +467,8 b' def update(repo, node, branchmerge, forc' | |||
|
467 | 467 | raise util.Abort(_("outstanding uncommitted merges")) |
|
468 | 468 | if branchmerge: |
|
469 | 469 | if pa == p2: |
|
470 |
raise util.Abort(_(" |
|
|
470 | raise util.Abort(_("merging with a working directory ancestor" | |
|
471 | " has no effect")) | |
|
471 | 472 | elif pa == p1: |
|
472 | 473 | if p1.branch() != p2.branch(): |
|
473 | 474 | fastforward = True |
General Comments 0
You need to be logged in to leave comments.
Login now