##// END OF EJS Templates
merge: do the trivial resolution after updating sparse checkout...
merge: do the trivial resolution after updating sparse checkout In merge, we do trivial resolution for files which were deleted on one side and changed on other. When sparse extension in involved that file might not be present in wdir and trivial resolution can lead to file not found error. This patch make sure we updates the sparse checkout before doing the trivial resolution. This fixes the test failure demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D3984
Pulkit Goyal -
r39017:d49e490a @94 stable
Show More
Name Size Modified Last Commit Author
/ doc
Makefile Loading ...
README Loading ...
check-seclevel.py Loading ...
docchecker Loading ...
gendoc.py Loading ...
hgmanpage.py Loading ...
runrst Loading ...
style.css Loading ...

Mercurial's documentation is kept in reStructuredText format, which is
a simple plain text format that's easy to read and edit:

http://docutils.sourceforge.net/rst.html

It's also convertible to a variety of other formats including standard
UNIX man page format and HTML. You'll need to install Docutils:

http://docutils.sourceforge.net/

Use the Makefile in this directory to generate the man and HTML pages.