Comments
Patch
@@ -14,3 +14,6 @@
* The deprecated `ui.progress()` has now been deleted. Please use
`ui.makeprogress()` instead.
+
+ * `hg.merge()` has lost its `abort` argument. Please call
+ `hg.abortmerge()` directly instead.
@@ -1138,19 +1138,10 @@
def merge(
- repo,
- node,
- force=None,
- remind=True,
- mergeforce=False,
- labels=None,
- abort=False,
+ repo, node, force=None, remind=True, mergeforce=False, labels=None,
):
"""Branch merge with node, resolving changes. Return true if any
unresolved conflicts."""
- if abort:
- return abortmerge(repo.ui, repo)
-
stats = mergemod.update(
repo,
node,
@@ -4894,11 +4894,7 @@
force = opts.get(b'force')
labels = [b'working copy', b'merge rev']
return hg.merge(
- repo,
- node,
- force=force,
- mergeforce=force,
- labels=labels,
+ repo, node, force=force, mergeforce=force, labels=labels
)