Mercurial > hg
view contrib/chg/README @ 30538:c2154979409d
merge: use original file extension for temporary files
Some merge tools (like Araxis?) can pick merge mode based on the file
extension. That didn't work well when temporary files were given random
suffixes. It seems to work better when the random part is before the extension.
As usual, when using $output, $local will have the .orig extension. That could
perhaps be the subject of another change another day.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 23 Nov 2016 23:47:38 +0100 |
parents | 66d41c9e9222 |
children | 4c8d9b53b1c7 |
line wrap: on
line source
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