##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: consider the file merged when using :merge-{local,other}...
merge: consider the file merged when using :merge-{local,other} Returning `None` from `simplemerge()` means that the caller interprets it as "no merge was necessary (because two sides matched)". See 6217040b2780 and issue2680 for some background. However, `simplemerge()` shouldn't even get called in such scenarios, and returning `None` means that the file is not considered merged, even though the contents actually were. See the affected test cases. Differential Revision: https://phab.mercurial-scm.org/D11999
Valentin Gatien-Baron - - Load All Authors

File last commit:

r46125:eb443f7c default
r49415:50de0890 default
Show More
README
40 lines | 1.2 KiB | text/plain | TextLexer
/ contrib / chg / README
History | Annotation | Raw |Copy content |Copy permalink
cHg
===
A fast client for Mercurial command server running on Unix.
Install:
$ make
$ make install
Usage:
$ chg help # show help of Mercurial
$ alias hg=chg # replace hg command
$ chg --kill-chg-daemon # terminate background server
Environment variables:
Although cHg tries to update environment variables, some of them cannot be
changed after spawning the server. The following variables are specially
handled:
* configuration files are reloaded automatically by default.
* CHGHG or HG specifies the path to the hg executable spawned as the
background command server.
The following variables are available for testing:
* CHGDEBUG enables debug messages.
* CHGSOCKNAME specifies the socket path of the background cmdserver.
* CHGTIMEOUT specifies how many seconds chg will wait before giving up
connecting to a cmdserver. If it is 0, chg will wait forever. Default: 60
Build environment variables:
* HGPATH: the path to the hg executable to call when CHGHG and HG are not set,
instead of "hg"
* HGPATHREL=1: when CHGHG and HG are not set, the hg executable will be ./hg
relative to the chg executable. Only works on linux, falls back to "hg"
otherwise.