merge: introduce a clean_update() for that use-case...

merge: introduce a clean_update() for that use-case I find it hard to understand what value to pass for all the arguments to `merge.update()`. I would like to introduce functions that are more specific to each use-case. We already have `graft()`. This patch introduces a `clean_update()` and uses it in some places to show that it works. Differential Revision: https://phab.mercurial-scm.org/D7902

Martin von Zweigbergk -


            r44743:f546d217

default

Name	Size	Modified	Last Commit	Author

contrib
doc
hgdemandimport
hgext
hgext3rd
i18n
mercurial
relnotes
rust
tests
.arcconfig	Loading ...
.clang-format	Loading ...
.editorconfig	Loading ...
.hgignore	Loading ...
.hgsigs	Loading ...
.hgtags	Loading ...
.jshintrc	Loading ...
CONTRIBUTING	Loading ...
CONTRIBUTORS	Loading ...
COPYING	Loading ...
Makefile	Loading ...
README.rst	Loading ...
black.toml	Loading ...
hg	Loading ...
hgeditor	Loading ...
hgweb.cgi	Loading ...
setup.py	Loading ...

README.rst

Mercurial

Mercurial is a fast, easy to use, distributed revision control tool for software developers.

Basic install:

$ make            # see install targets
$ make install    # do a system-wide install
$ hg debuginstall # sanity-check setup
$ hg              # see help

Running without installing:

$ make local      # build for inplace usage
$ ./hg --version  # should show the latest version

See https://mercurial-scm.org/ for detailed installation instructions, platform-specific notes, and Mercurial user information.

	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