equal
deleted
inserted
replaced
1056 |
1056 |
1057 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) |
1057 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) |
1058 |
1058 |
1059 ### check phase |
1059 ### check phase |
1060 if not overwrite and len(pl) > 1: |
1060 if not overwrite and len(pl) > 1: |
1061 raise util.Abort(_("outstanding uncommitted merges")) |
1061 raise util.Abort(_("outstanding uncommitted merge")) |
1062 if branchmerge: |
1062 if branchmerge: |
1063 if pas == [p2]: |
1063 if pas == [p2]: |
1064 raise util.Abort(_("merging with a working directory ancestor" |
1064 raise util.Abort(_("merging with a working directory ancestor" |
1065 " has no effect")) |
1065 " has no effect")) |
1066 elif pas == [p1]: |
1066 elif pas == [p1]: |