upstream/mercurial-mirror Files · contrib/automation/hgautomation

tests: demonstrate how conflict markers end up $local *and* $output...

tests: demonstrate how conflict markers end up $local *and* $output When a merge tool is configured to keep conflict markers, they are supposed to be written to `$local` if `$output` is not mentioned in the tool's `merge-tools.<tool>.args` config, and in `$output` if it is mentioned. However, I broke the latter case in D12190. Differential Revision: https://phab.mercurial-scm.org/D12378

Martin von Zweigbergk -


            r49822:b10a944c

stable

Name	Size	Modified	Last Commit	Author
/ contrib / automation / hgautomation
__init__.py	Loading ...
aws.py	Loading ...
cli.py	Loading ...
linux.py	Loading ...
pypi.py	Loading ...
ssh.py	Loading ...
try_server.py	Loading ...
windows.py	Loading ...
winrm.py	Loading ...

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages