Mercurial > public > mercurial-scm > hg
comparison mercurial/hg.py @ 44178:bd4f666b55a7
merge: drop now-unused "abort" argument from hg.merge()
Differential Revision: https://phab.mercurial-scm.org/D7997
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 24 Jan 2020 16:07:42 -0800 |
| parents | 2b6632d64328 |
| children | f546d2170b0f |
comparison
equal
deleted
inserted
replaced
| 44177:1850066f9e36 | 44178:bd4f666b55a7 |
|---|---|
| 1136 | 1136 |
| 1137 return ret | 1137 return ret |
| 1138 | 1138 |
| 1139 | 1139 |
| 1140 def merge( | 1140 def merge( |
| 1141 repo, | 1141 repo, node, force=None, remind=True, mergeforce=False, labels=None, |
| 1142 node, | |
| 1143 force=None, | |
| 1144 remind=True, | |
| 1145 mergeforce=False, | |
| 1146 labels=None, | |
| 1147 abort=False, | |
| 1148 ): | 1142 ): |
| 1149 """Branch merge with node, resolving changes. Return true if any | 1143 """Branch merge with node, resolving changes. Return true if any |
| 1150 unresolved conflicts.""" | 1144 unresolved conflicts.""" |
| 1151 if abort: | |
| 1152 return abortmerge(repo.ui, repo) | |
| 1153 | |
| 1154 stats = mergemod.update( | 1145 stats = mergemod.update( |
| 1155 repo, | 1146 repo, |
| 1156 node, | 1147 node, |
| 1157 branchmerge=True, | 1148 branchmerge=True, |
| 1158 force=force, | 1149 force=force, |