equal
deleted
inserted
replaced
465 ### check phase |
465 ### check phase |
466 if not overwrite and len(pl) > 1: |
466 if not overwrite and len(pl) > 1: |
467 raise util.Abort(_("outstanding uncommitted merges")) |
467 raise util.Abort(_("outstanding uncommitted merges")) |
468 if branchmerge: |
468 if branchmerge: |
469 if pa == p2: |
469 if pa == p2: |
470 raise util.Abort(_("can't merge with ancestor")) |
470 raise util.Abort(_("merging with a working directory ancestor" |
|
471 " has no effect")) |
471 elif pa == p1: |
472 elif pa == p1: |
472 if p1.branch() != p2.branch(): |
473 if p1.branch() != p2.branch(): |
473 fastforward = True |
474 fastforward = True |
474 else: |
475 else: |
475 raise util.Abort(_("nothing to merge (use 'hg update'" |
476 raise util.Abort(_("nothing to merge (use 'hg update'" |