equal
deleted
inserted
replaced
2023 if not overwrite: |
2023 if not overwrite: |
2024 if len(pl) > 1: |
2024 if len(pl) > 1: |
2025 raise error.Abort(_("outstanding uncommitted merge")) |
2025 raise error.Abort(_("outstanding uncommitted merge")) |
2026 ms = mergestate.read(repo) |
2026 ms = mergestate.read(repo) |
2027 if list(ms.unresolved()): |
2027 if list(ms.unresolved()): |
2028 raise error.Abort(_("outstanding merge conflicts")) |
2028 raise error.Abort(_("outstanding merge conflicts"), |
|
2029 hint=_("use 'hg resolve' to resolve")) |
2029 if branchmerge: |
2030 if branchmerge: |
2030 if pas == [p2]: |
2031 if pas == [p2]: |
2031 raise error.Abort(_("merging with a working directory ancestor" |
2032 raise error.Abort(_("merging with a working directory ancestor" |
2032 " has no effect")) |
2033 " has no effect")) |
2033 elif pas == [p1]: |
2034 elif pas == [p1]: |