Mercurial > hg
comparison mercurial/merge.py @ 42804:7b80ad5af239
merge: hint about using `hg resolve` for resolving conflicts
This was suggested by one of our users at Google. Makes sense to me.
Differential Revision: https://phab.mercurial-scm.org/D6755
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 21 Aug 2019 13:14:39 -0700 |
parents | d29db0a0c4eb |
children | f059d6ffcdf0 |
comparison
equal
deleted
inserted
replaced
42803:8ab1ae7f1cf4 | 42804:7b80ad5af239 |
---|---|
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]: |