Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/help.py @ 6009:f077815932ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
6008:33bfedc0be4a 6009:f077815932ce
64 HGMERGE:: 64 HGMERGE::
65 An executable to use for resolving merge conflicts. The program 65 An executable to use for resolving merge conflicts. The program
66 will be executed with three arguments: local file, remote file, 66 will be executed with three arguments: local file, remote file,
67 ancestor file. 67 ancestor file.
68 68
69 The default program is "hgmerge", which is a shell script provided
70 by Mercurial with some sensible defaults.
71
72 (deprecated, use .hgrc) 69 (deprecated, use .hgrc)
73 70
74 HGRCPATH:: 71 HGRCPATH::
75 A list of files or directories to search for hgrc files. Item 72 A list of files or directories to search for hgrc files. Item
76 separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set, 73 separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set,
95 92
96 VISUAL:: 93 VISUAL::
97 This is the name of the editor to use when committing. See EDITOR. 94 This is the name of the editor to use when committing. See EDITOR.
98 95
99 EDITOR:: 96 EDITOR::
100 Sometimes Mercurial needs to open a text file in an editor for a user 97 Sometimes Mercurial needs to open a text file in an editor
101 to modify, for example when writing commit messages or when using the 98 for a user to modify, for example when writing commit messages.
102 hgmerge script. The editor it uses is determined by looking at the 99 The editor it uses is determined by looking at the environment
103 environment variables HGEDITOR, VISUAL and EDITOR, in that order. The 100 variables HGEDITOR, VISUAL and EDITOR, in that order. The first
104 first non-empty one is chosen. If all of them are empty, the editor 101 non-empty one is chosen. If all of them are empty, the editor
105 defaults to 'vi'. 102 defaults to 'vi'.
106 103
107 PYTHONPATH:: 104 PYTHONPATH::
108 This is used by Python to find imported modules and may need to be set 105 This is used by Python to find imported modules and may need to be set
109 appropriately if Mercurial is not installed system-wide. 106 appropriately if Mercurial is not installed system-wide.