upstream/mercurial-mirror Files · \ · RhodeCode Free Hosting

merge: implement --tool arguments using new ui.forcemerge configurable...

merge: implement --tool arguments using new ui.forcemerge configurable ui.forcemerge is set before calling into merge or resolve commands, then unset to prevent ui pollution for further operations. ui.forcemerge takes precedence over HGMERGE, but mimics HGMERGE behavior if the given --tool is not found by the merge-tools machinery. This makes it possible to do: hg resolve --tool="python mymerge.py" FILE With this approach, HGMERGE and ui.merge are not harmed by --tool

Steve Borho -


            r12788:de793925

default

Name	Size	Modified	Last Commit	Author

contrib
doc
hgext
i18n
mercurial
tests
.hgignore	Loading ...
.hgsigs	Loading ...
.hgtags	Loading ...
CONTRIBUTORS	Loading ...
COPYING	Loading ...
Makefile	Loading ...
README	Loading ...
hg	Loading ...
hgeditor	Loading ...
hgweb.cgi	Loading ...
setup.py	Loading ...

README

Basic install:

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

See http://mercurial.selenic.com/ 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