equal
deleted
inserted
replaced
521 ### check phase |
521 ### check phase |
522 if not overwrite and len(pl) > 1: |
522 if not overwrite and len(pl) > 1: |
523 raise util.Abort(_("outstanding uncommitted merges")) |
523 raise util.Abort(_("outstanding uncommitted merges")) |
524 if pa == p1 or pa == p2: # is there a linear path from p1 to p2? |
524 if pa == p1 or pa == p2: # is there a linear path from p1 to p2? |
525 if branchmerge: |
525 if branchmerge: |
526 if p1.branch() != p2.branch(): |
526 if p1.branch() != p2.branch() and pa != p2: |
527 fastforward = True |
527 fastforward = True |
528 else: |
528 else: |
529 raise util.Abort(_("there is nothing to merge, just use " |
529 raise util.Abort(_("there is nothing to merge, just use " |
530 "'hg update' or look at 'hg heads'")) |
530 "'hg update' or look at 'hg heads'")) |
531 elif not (overwrite or branchmerge): |
531 elif not (overwrite or branchmerge): |