##// END OF EJS Templates
merge: pass mergeresult in checkpassconflicts() instead of actions (API)...
merge: pass mergeresult in checkpassconflicts() instead of actions (API) This is a part of series which aims to use mergeresult obj instead of an action dictionary. Differential Revision: https://phab.mercurial-scm.org/D8822
Pulkit Goyal -
r45841:31c454a5 default
Show More
Name Size Modified Last Commit Author
/ mercurial / helptext
internals
__init__.py Loading ...
bundlespec.txt Loading ...
color.txt Loading ...
common.txt Loading ...
config.txt Loading ...
dates.txt Loading ...
deprecated.txt Loading ...
diffs.txt Loading ...
environment.txt Loading ...
extensions.txt Loading ...
filesets.txt Loading ...
flags.txt Loading ...
glossary.txt Loading ...
hg-ssh.8.txt Loading ...
hg.1.txt Loading ...
hgignore.5.txt Loading ...
hgignore.txt Loading ...
hgrc.5.txt Loading ...
hgweb.txt Loading ...
merge-tools.txt Loading ...
pager.txt Loading ...
patterns.txt Loading ...
phases.txt Loading ...
revisions.txt Loading ...
scripting.txt Loading ...
subrepos.txt Loading ...
templates.txt Loading ...
urls.txt Loading ...