This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2011

filemerge: support passing labels to external merge tools
ClosedPublic

Authored by spectral on Feb 2 2018, 5:10 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG9037c29e9f53: filemerge: support passing labels to external merge tools
Summary

This adds $labellocal, $labelother, and $labelbase to the replacement set for
merge-tools.<tool>.args config variables, and to the environment as HG_MY_LABEL,
HG_OTHER_LABEL, and HG_BASE_LABEL, respectively.

We also add merge-tools.<tool>.mergemarkers and
merge-tools.<tool>.mergemarkertemplate config variables as counterparts of
the variables available in [ui]. We are intentionally *not* respecting
ui.mergemarkers when calling out to external merge programs; too often the
default template will be too wide to display comfortably in most GUIs.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Feb 2 2018, 5:10 PM
yuja accepted this revision.Feb 3 2018, 9:36 PM
This revision is now accepted and ready to land.Feb 3 2018, 9:36 PM
Closed by commit rHG9037c29e9f53: filemerge: support passing labels to external merge tools (authored by spectral). · Explain WhyFeb 3 2018, 9:49 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5178

mercurial/configitems.py

generic=True, generic=True,
priority=-1, priority=-1,
) )
coreconfigitem('merge-tools', br'.*\.gui$', coreconfigitem('merge-tools', br'.*\.gui$',
default=False, default=False,
generic=True, generic=True,
priority=-1, priority=-1,
) )
coreconfigitem('merge-tools', br'.*\.mergemarkers$',
default='basic',
generic=True,
priority=-1,
)
coreconfigitem('merge-tools', br'.*\.mergemarkertemplate$',
default=dynamicdefault, # take from ui.mergemarkertemplate
generic=True,
priority=-1,
)
coreconfigitem('merge-tools', br'.*\.priority$', coreconfigitem('merge-tools', br'.*\.priority$',
default=0, default=0,
generic=True, generic=True,
priority=-1, priority=-1,
) )
coreconfigitem('merge-tools', br'.*\.premerge$', coreconfigitem('merge-tools', br'.*\.premerge$',
default=dynamicdefault, default=dynamicdefault,
generic=True, generic=True,

mercurial/filemerge.py

repo.ui.warn(_('warning: %s cannot merge change/delete conflict ' repo.ui.warn(_('warning: %s cannot merge change/delete conflict '
'for %s\n') % (tool, fcd.path())) 'for %s\n') % (tool, fcd.path()))
return False, 1, None return False, 1, None
unused, unused, unused, back = files unused, unused, unused, back = files
a = _workingpath(repo, fcd) a = _workingpath(repo, fcd)
b, c = _maketempfiles(repo, fco, fca) b, c = _maketempfiles(repo, fco, fca)
try: try:
out = "" out = ""
mylabel, otherlabel = labels[:2]
if len(labels) >= 3:
baselabel = labels[2]
else:
baselabel = 'base'
env = {'HG_FILE': fcd.path(), env = {'HG_FILE': fcd.path(),
'HG_MY_NODE': short(mynode), 'HG_MY_NODE': short(mynode),
'HG_OTHER_NODE': str(fco.changectx()), 'HG_OTHER_NODE': str(fco.changectx()),
'HG_BASE_NODE': str(fca.changectx()), 'HG_BASE_NODE': str(fca.changectx()),
'HG_MY_ISLINK': 'l' in fcd.flags(), 'HG_MY_ISLINK': 'l' in fcd.flags(),
'HG_OTHER_ISLINK': 'l' in fco.flags(), 'HG_OTHER_ISLINK': 'l' in fco.flags(),
'HG_BASE_ISLINK': 'l' in fca.flags(), 'HG_BASE_ISLINK': 'l' in fca.flags(),
'HG_MY_LABEL': mylabel,
'HG_OTHER_LABEL': otherlabel,
'HG_BASE_LABEL': baselabel,
} }
ui = repo.ui ui = repo.ui
args = _toolstr(ui, tool, "args") args = _toolstr(ui, tool, "args")
if "$output" in args: if "$output" in args:
# read input from backup, write to original # read input from backup, write to original
out = a out = a
a = repo.wvfs.join(back.path()) a = repo.wvfs.join(back.path())
replace = {'local': a, 'base': b, 'other': c, 'output': out} replace = {'local': a, 'base': b, 'other': c, 'output': out,
'labellocal': mylabel, 'labelother': otherlabel,
'labelbase': baselabel}
args = util.interpolate(br'\$', replace, args, args = util.interpolate(br'\$', replace, args,
lambda s: util.shellquote(util.localpath(s))) lambda s: util.shellquote(util.localpath(s)))
cmd = toolpath + ' ' + args cmd = toolpath + ' ' + args
if _toolbool(ui, tool, "gui"): if _toolbool(ui, tool, "gui"):
repo.ui.status(_('running merge tool %s for file %s\n') % repo.ui.status(_('running merge tool %s for file %s\n') %
(tool, fcd.path())) (tool, fcd.path()))
repo.ui.debug('launching merge tool: %s\n' % cmd) repo.ui.debug('launching merge tool: %s\n' % cmd)
r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool') r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool')
if mark: if mark:
mark = mark.splitlines()[0] # split for safety mark = mark.splitlines()[0] # split for safety
# 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ') # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')
return util.ellipsis(mark, 80 - 8) return util.ellipsis(mark, 80 - 8)
_defaultconflictlabels = ['local', 'other'] _defaultconflictlabels = ['local', 'other']
def _formatlabels(repo, fcd, fco, fca, labels): def _formatlabels(repo, fcd, fco, fca, labels, tool=None):
"""Formats the given labels using the conflict marker template. """Formats the given labels using the conflict marker template.
Returns a list of formatted labels. Returns a list of formatted labels.
""" """
cd = fcd.changectx() cd = fcd.changectx()
co = fco.changectx() co = fco.changectx()
ca = fca.changectx() ca = fca.changectx()
ui = repo.ui ui = repo.ui
template = ui.config('ui', 'mergemarkertemplate') template = ui.config('ui', 'mergemarkertemplate')
if tool is not None:
template = _toolstr(ui, tool, 'mergemarkertemplate', template)
template = templater.unquotestring(template) template = templater.unquotestring(template)
tres = formatter.templateresources(ui, repo) tres = formatter.templateresources(ui, repo)
tmpl = formatter.maketemplater(ui, template, defaults=templatekw.keywords, tmpl = formatter.maketemplater(ui, template, defaults=templatekw.keywords,
resources=tres) resources=tres)
pad = max(len(l) for l in labels) pad = max(len(l) for l in labels)
newlabels = [_formatconflictmarker(cd, tmpl, labels[0], pad), newlabels = [_formatconflictmarker(cd, tmpl, labels[0], pad),
% (tool, fd, pycompat.bytestr(binary), pycompat.bytestr(symlink), % (tool, fd, pycompat.bytestr(binary), pycompat.bytestr(symlink),
pycompat.bytestr(changedelete))) pycompat.bytestr(changedelete)))
if tool in internals: if tool in internals:
func = internals[tool] func = internals[tool]
mergetype = func.mergetype mergetype = func.mergetype
onfailure = func.onfailure onfailure = func.onfailure
precheck = func.precheck precheck = func.precheck
isexternal = False
else: else:
if wctx.isinmemory(): if wctx.isinmemory():
func = _xmergeimm func = _xmergeimm
else: else:
func = _xmerge func = _xmerge
mergetype = fullmerge mergetype = fullmerge
onfailure = _("merging %s failed!\n") onfailure = _("merging %s failed!\n")
precheck = None precheck = None
isexternal = True
toolconf = tool, toolpath, binary, symlink toolconf = tool, toolpath, binary, symlink
if mergetype == nomerge: if mergetype == nomerge:
r, deleted = func(repo, mynode, orig, fcd, fco, fca, toolconf, labels) r, deleted = func(repo, mynode, orig, fcd, fco, fca, toolconf, labels)
return True, r, deleted return True, r, deleted
if premerge: if premerge:
'conflicts') 'conflicts')
ui.warn(onfailure % fd) ui.warn(onfailure % fd)
return True, 1, False return True, 1, False
back = _makebackup(repo, ui, wctx, fcd, premerge) back = _makebackup(repo, ui, wctx, fcd, premerge)
files = (None, None, None, back) files = (None, None, None, back)
r = 1 r = 1
try: try:
markerstyle = ui.config('ui', 'mergemarkers') internalmarkerstyle = ui.config('ui', 'mergemarkers')
if isexternal:
markerstyle = _toolstr(ui, tool, 'mergemarkers')
else:
markerstyle = internalmarkerstyle
if not labels: if not labels:
labels = _defaultconflictlabels labels = _defaultconflictlabels
formattedlabels = labels
if markerstyle != 'basic': if markerstyle != 'basic':
labels = _formatlabels(repo, fcd, fco, fca, labels) formattedlabels = _formatlabels(repo, fcd, fco, fca, labels,
tool=tool)
if premerge and mergetype == fullmerge: if premerge and mergetype == fullmerge:
r = _premerge(repo, fcd, fco, fca, toolconf, files, labels=labels) # conflict markers generated by premerge will use 'detailed'
# settings if either ui.mergemarkers or the tool's mergemarkers
# setting is 'detailed'. This way tools can have basic labels in
# space-constrained areas of the UI, but still get full information
# in conflict markers if premerge is 'keep' or 'keep-merge3'.
premergelabels = labels
labeltool = None
if markerstyle != 'basic':
# respect 'tool's mergemarkertemplate (which defaults to
# ui.mergemarkertemplate)
labeltool = tool
if internalmarkerstyle != 'basic' or markerstyle != 'basic':
premergelabels = _formatlabels(repo, fcd, fco, fca,
premergelabels, tool=labeltool)
r = _premerge(repo, fcd, fco, fca, toolconf, files,
labels=premergelabels)
# complete if premerge successful (r is 0) # complete if premerge successful (r is 0)
return not r, r, False return not r, r, False
needcheck, r, deleted = func(repo, mynode, orig, fcd, fco, fca, needcheck, r, deleted = func(repo, mynode, orig, fcd, fco, fca,
toolconf, files, labels=labels) toolconf, files, labels=formattedlabels)
if needcheck: if needcheck:
r = _check(repo, r, ui, tool, fcd, files) r = _check(repo, r, ui, tool, fcd, files)
if r: if r:
if onfailure: if onfailure:
if wctx.isinmemory(): if wctx.isinmemory():
raise error.InMemoryMergeConflictsError('in-memory merge ' raise error.InMemoryMergeConflictsError('in-memory merge '

mercurial/help/config.txt

On Windows, the path can use environment variables with ${ProgramFiles} On Windows, the path can use environment variables with ${ProgramFiles}
syntax. syntax.
(default: the tool name) (default: the tool name)
``args`` ``args``
The arguments to pass to the tool executable. You can refer to the The arguments to pass to the tool executable. You can refer to the
files being merged as well as the output file through these files being merged as well as the output file through these
variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning variables: ``$base``, ``$local``, ``$other``, ``$output``.
of ``$local`` and ``$other`` can vary depending on which action is being
performed. During and update or merge, ``$local`` represents the original The meaning of ``$local`` and ``$other`` can vary depending on which action is
state of the file, while ``$other`` represents the commit you are updating being performed. During an update or merge, ``$local`` represents the original
to or the commit you are merging with. During a rebase ``$local`` state of the file, while ``$other`` represents the commit you are updating to or
represents the destination of the rebase, and ``$other`` represents the the commit you are merging with. During a rebase, ``$local`` represents the
commit being rebased. destination of the rebase, and ``$other`` represents the commit being rebased.
Some operations define custom labels to assist with identifying the revisions,
accessible via ``$labellocal``, ``$labelother``, and ``$labelbase``. If custom
labels are not available, these will be ``local``, ``other``, and ``base``,
respectively.
(default: ``$local $base $other``) (default: ``$local $base $other``)
``premerge`` ``premerge``
Attempt to run internal non-interactive 3-way merge tool before Attempt to run internal non-interactive 3-way merge tool before
launching external tool. Options are ``true``, ``false``, ``keep`` or launching external tool. Options are ``true``, ``false``, ``keep`` or
``keep-merge3``. The ``keep`` option will leave markers in the file if the ``keep-merge3``. The ``keep`` option will leave markers in the file if the
premerge fails. The ``keep-merge3`` will do the same but include information premerge fails. The ``keep-merge3`` will do the same but include information
about the base of the merge in the marker (see internal :merge3 in about the base of the merge in the marker (see internal :merge3 in
``fixeol`` ``fixeol``
Attempt to fix up EOL changes caused by the merge tool. Attempt to fix up EOL changes caused by the merge tool.
(default: False) (default: False)
``gui`` ``gui``
This tool requires a graphical interface to run. (default: False) This tool requires a graphical interface to run. (default: False)
``mergemarkers``
Controls whether the labels passed via ``$labellocal``, ``$labelother``, and
``$labelbase`` are ``detailed`` (respecting ``mergemarkertemplate``) or
``basic``. If ``premerge`` is ``keep`` or ``keep-merge3``, the conflict
markers generated during premerge will be ``detailed`` if either this option or
the corresponding option in the ``[ui]`` section is ``detailed``.
(default: ``basic``)
``mergemarkertemplate``
This setting can be used to override ``mergemarkertemplate`` from the ``[ui]``
section on a per-tool basis; this applies to the ``$label``-prefixed variables
and to the conflict markers that are generated if ``premerge`` is ``keep` or
``keep-merge3``. See the corresponding variable in ``[ui]`` for more
information.
.. container:: windows .. container:: windows
``regkey`` ``regkey``
Windows registry key which describes install location of this Windows registry key which describes install location of this
tool. Mercurial will search for this key first under tool. Mercurial will search for this key first under
``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``. ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.
(default: None) (default: None)
If you use non-ASCII characters in names for tags, branches, bookmarks, If you use non-ASCII characters in names for tags, branches, bookmarks,
authors, and/or commit descriptions, you must pay attention to encodings of authors, and/or commit descriptions, you must pay attention to encodings of
managed files. At template expansion, non-ASCII characters use the encoding managed files. At template expansion, non-ASCII characters use the encoding
specified by the ``--encoding`` global option, ``HGENCODING`` or other specified by the ``--encoding`` global option, ``HGENCODING`` or other
environment variables that govern your locale. If the encoding of the merge environment variables that govern your locale. If the encoding of the merge
markers is different from the encoding of the merged files, markers is different from the encoding of the merged files,
serious problems may occur. serious problems may occur.
Can be overridden per-merge-tool, see the ``[merge-tools]`` section.
``origbackuppath`` ``origbackuppath``
The path to a directory used to store generated .orig files. If the path is The path to a directory used to store generated .orig files. If the path is
not a directory, one will be created. If set, files stored in this not a directory, one will be created. If set, files stored in this
directory have the same name as the original file and do not have a .orig directory have the same name as the original file and do not have a .orig
suffix. suffix.
``paginate`` ``paginate``
Control the pagination of command output (default: True). See :hg:`help pager` Control the pagination of command output (default: True). See :hg:`help pager`

tests/test-merge-tools.t

======= =======
revision 4 revision 4
>>>>>>> merge rev: 81448d39c9a0 - test: revision 4 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4
# hg stat # hg stat
M f M f
# hg resolve --list # hg resolve --list
R f R f
premerge=keep respects ui.mergemarkers=basic:
$ beforemerge
[merge-tools]
false.whatever=
true.priority=1
true.executable=cat
# hg update -C 1
$ hg merge -r 4 --config merge-tools.true.premerge=keep --config ui.mergemarkers=basic
merging f
<<<<<<< working copy
revision 1
space
=======
revision 4
>>>>>>> merge rev
revision 0
space
revision 4
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ aftermerge
# cat f
<<<<<<< working copy
revision 1
space
=======
revision 4
>>>>>>> merge rev
# hg stat
M f
# hg resolve --list
R f
premerge=keep ignores ui.mergemarkers=basic if true.mergemarkers=detailed:
$ beforemerge
[merge-tools]
false.whatever=
true.priority=1
true.executable=cat
# hg update -C 1
$ hg merge -r 4 --config merge-tools.true.premerge=keep \
> --config ui.mergemarkers=basic \
> --config merge-tools.true.mergemarkers=detailed
merging f
<<<<<<< working copy: ef83787e2614 - test: revision 1
revision 1
space
=======
revision 4
>>>>>>> merge rev: 81448d39c9a0 - test: revision 4
revision 0
space
revision 4
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ aftermerge
# cat f
<<<<<<< working copy: ef83787e2614 - test: revision 1
revision 1
space
=======
revision 4
>>>>>>> merge rev: 81448d39c9a0 - test: revision 4
# hg stat
M f
# hg resolve --list
R f
premerge=keep respects ui.mergemarkertemplate instead of
true.mergemarkertemplate if true.mergemarkers=basic:
$ beforemerge
[merge-tools]
false.whatever=
true.priority=1
true.executable=cat
# hg update -C 1
$ hg merge -r 4 --config merge-tools.true.premerge=keep \
> --config ui.mergemarkertemplate='uitmpl {rev}' \
> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}'
merging f
<<<<<<< working copy: uitmpl 1
revision 1
space
=======
revision 4
>>>>>>> merge rev: uitmpl 4
revision 0
space
revision 4
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ aftermerge
# cat f
<<<<<<< working copy: uitmpl 1
revision 1
space
=======
revision 4
>>>>>>> merge rev: uitmpl 4
# hg stat
M f
# hg resolve --list
R f
premerge=keep respects true.mergemarkertemplate instead of
true.mergemarkertemplate if true.mergemarkers=detailed:
$ beforemerge
[merge-tools]
false.whatever=
true.priority=1
true.executable=cat
# hg update -C 1
$ hg merge -r 4 --config merge-tools.true.premerge=keep \
> --config ui.mergemarkertemplate='uitmpl {rev}' \
> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
> --config merge-tools.true.mergemarkers=detailed
merging f
<<<<<<< working copy: tooltmpl ef83787e2614
revision 1
space
=======
revision 4
>>>>>>> merge rev: tooltmpl 81448d39c9a0
revision 0
space
revision 4
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ aftermerge
# cat f
<<<<<<< working copy: tooltmpl ef83787e2614
revision 1
space
=======
revision 4
>>>>>>> merge rev: tooltmpl 81448d39c9a0
# hg stat
M f
# hg resolve --list
R f
Tool execution Tool execution
set tools.args explicit to include $base $local $other $output: set tools.args explicit to include $base $local $other $output:
$ beforemerge $ beforemerge
[merge-tools] [merge-tools]
false.whatever= false.whatever=
space space
revision 2 revision 2
space space
# hg stat # hg stat
M f M f
# hg resolve --list # hg resolve --list
R f R f
Merge using a tool that supports labellocal, labelother, and labelbase, checking
that they're quoted properly as well. This is using the default 'basic'
mergemarkers even though ui.mergemarkers is 'detailed', so it's ignoring both
mergemarkertemplate settings:
$ beforemerge
[merge-tools]
false.whatever=
true.priority=1
true.executable=cat
# hg update -C 1
$ cat <<EOF > printargs_merge_tool
> while test \$# -gt 0; do echo arg: \"\$1\"; shift; done
> EOF
$ hg --config merge-tools.true.executable='sh' \
> --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \
> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
> --config ui.mergemarkertemplate='uitmpl {rev}' \
> --config ui.mergemarkers=detailed \
> merge -r 2
merging f
arg: "ll:working copy"
arg: "lo:"
arg: "merge rev"
arg: "lb:base: /tmp/f~base.*" (glob)
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ rm -f 'printargs_merge_tool'
Merge using a tool that supports labellocal, labelother, and labelbase, checking
that they're quoted properly as well. This is using 'detailed' mergemarkers,
even though ui.mergemarkers is 'basic', and using the tool's
mergemarkertemplate:
$ beforemerge
[merge-tools]
false.whatever=
true.priority=1
true.executable=cat
# hg update -C 1
$ cat <<EOF > printargs_merge_tool
> while test \$# -gt 0; do echo arg: \"\$1\"; shift; done
> EOF
$ hg --config merge-tools.true.executable='sh' \
> --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \
> --config merge-tools.true.mergemarkers=detailed \
> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
> --config ui.mergemarkertemplate='uitmpl {rev}' \
> --config ui.mergemarkers=basic \
> merge -r 2
merging f
arg: "ll:working copy: tooltmpl ef83787e2614"
arg: "lo:"
arg: "merge rev: tooltmpl 0185f4e0cf02"
arg: "lb:base: /tmp/f~base.*" (glob)
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ rm -f 'printargs_merge_tool'
The merge tool still gets labellocal and labelother as 'basic' even when
premerge=keep is used and has 'detailed' markers:
$ beforemerge
[merge-tools]
false.whatever=
true.priority=1
true.executable=cat
# hg update -C 1
$ cat <<EOF > mytool
> echo labellocal: \"\$1\"
> echo labelother: \"\$2\"
> echo "output (arg)": \"\$3\"
> echo "output (contents)":
> cat "\$3"
> EOF
$ hg --config merge-tools.true.executable='sh' \
> --config merge-tools.true.args='mytool $labellocal $labelother $output' \
> --config merge-tools.true.premerge=keep \
> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
> --config ui.mergemarkertemplate='uitmpl {rev}' \
> --config ui.mergemarkers=detailed \
> merge -r 2
merging f
labellocal: "working copy"
labelother: "merge rev"
output (arg): "$TESTTMP/f"
output (contents):
<<<<<<< working copy: uitmpl 1
revision 1
=======
revision 2
>>>>>>> merge rev: uitmpl 2
space
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ rm -f 'mytool'
premerge=keep uses the *tool's* mergemarkertemplate if tool's
mergemarkers=detailed; labellocal and labelother also use the tool's template
$ beforemerge
[merge-tools]
false.whatever=
true.priority=1
true.executable=cat
# hg update -C 1
$ cat <<EOF > mytool
> echo labellocal: \"\$1\"
> echo labelother: \"\$2\"
> echo "output (arg)": \"\$3\"
> echo "output (contents)":
> cat "\$3"
> EOF
$ hg --config merge-tools.true.executable='sh' \
> --config merge-tools.true.args='mytool $labellocal $labelother $output' \
> --config merge-tools.true.premerge=keep \
> --config merge-tools.true.mergemarkers=detailed \
> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
> --config ui.mergemarkertemplate='uitmpl {rev}' \
> --config ui.mergemarkers=detailed \
> merge -r 2
merging f
labellocal: "working copy: tooltmpl ef83787e2614"
labelother: "merge rev: tooltmpl 0185f4e0cf02"
output (arg): "$TESTTMP/f"
output (contents):
<<<<<<< working copy: tooltmpl ef83787e2614
revision 1
=======
revision 2
>>>>>>> merge rev: tooltmpl 0185f4e0cf02
space
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ rm -f 'mytool'
Issue3581: Merging a filename that needs to be quoted Issue3581: Merging a filename that needs to be quoted
(This test doesn't work on Windows filesystems even on Linux, so check (This test doesn't work on Windows filesystems even on Linux, so check
for Unix-like permission) for Unix-like permission)
#if unix-permissions #if unix-permissions
$ beforemerge $ beforemerge
[merge-tools] [merge-tools]
false.whatever= false.whatever=