Mercurial > public > mercurial-scm > hg-stable
diff mercurial/help.py @ 6009:f077815932ce
filemerge: remove the hgmerge script
This is now better handled using [merge-tools] and [merge-patterns] in hgrc.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 03 Feb 2008 19:29:05 -0600 |
| parents | 3c80ecdc1bcd |
| children | 1f733c2f0165 |
line wrap: on
line diff
--- a/mercurial/help.py Sun Feb 03 19:29:05 2008 -0600 +++ b/mercurial/help.py Sun Feb 03 19:29:05 2008 -0600 @@ -66,9 +66,6 @@ will be executed with three arguments: local file, remote file, ancestor file. - The default program is "hgmerge", which is a shell script provided - by Mercurial with some sensible defaults. - (deprecated, use .hgrc) HGRCPATH:: @@ -97,11 +94,11 @@ This is the name of the editor to use when committing. See EDITOR. EDITOR:: - Sometimes Mercurial needs to open a text file in an editor for a user - to modify, for example when writing commit messages or when using the - hgmerge script. The editor it uses is determined by looking at the - environment variables HGEDITOR, VISUAL and EDITOR, in that order. The - first non-empty one is chosen. If all of them are empty, the editor + Sometimes Mercurial needs to open a text file in an editor + for a user to modify, for example when writing commit messages. + The editor it uses is determined by looking at the environment + variables HGEDITOR, VISUAL and EDITOR, in that order. The first + non-empty one is chosen. If all of them are empty, the editor defaults to 'vi'. PYTHONPATH::