Skip to content
Snippets Groups Projects
Commit fa159bb4 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

simplemerge: avoid a call to `pycompat.strkwargs()`

Differential Revision: https://phab.mercurial-scm.org/D11886
parent 58a3be48
No related branches found
No related tags found
No related merge requests found
......@@ -516,7 +516,7 @@
m3 = Merge3Text(basetext, localtext, othertext)
extrakwargs = {
b"localorother": opts.get("localorother", None),
b'minimize': True,
"localorother": opts.get("localorother", None),
'minimize': True,
}
if mode == b'union':
......@@ -521,6 +521,6 @@
}
if mode == b'union':
extrakwargs[b'start_marker'] = None
extrakwargs[b'mid_marker'] = None
extrakwargs[b'end_marker'] = None
extrakwargs['start_marker'] = None
extrakwargs['mid_marker'] = None
extrakwargs['end_marker'] = None
elif name_base is not None:
......@@ -526,9 +526,9 @@
elif name_base is not None:
extrakwargs[b'base_marker'] = b'|||||||'
extrakwargs[b'name_base'] = name_base
extrakwargs[b'minimize'] = False
extrakwargs['base_marker'] = b'|||||||'
extrakwargs['name_base'] = name_base
extrakwargs['minimize'] = False
if mode == b'mergediff':
lines, conflicts = _mergediff(m3, name_a, name_b, name_base)
else:
lines = list(
......@@ -530,11 +530,9 @@
if mode == b'mergediff':
lines, conflicts = _mergediff(m3, name_a, name_b, name_base)
else:
lines = list(
m3.merge_lines(
name_a=name_a, name_b=name_b, **pycompat.strkwargs(extrakwargs)
)
m3.merge_lines(name_a=name_a, name_b=name_b, **extrakwargs)
)
conflicts = m3.conflicts and not mode == b'union'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment