Show More
@@ -233,6 +233,78 b' format::' | |||
|
233 | 233 | you to store longer filenames in some situations at the expense of |
|
234 | 234 | compatibility. |
|
235 | 235 | |
|
236 | merge-patterns:: | |
|
237 | This section specifies merge tools to associate with particular file | |
|
238 | patterns. Tools matched here will take precedence over the default | |
|
239 | merge tool. Patterns are globs by default, rooted at the repository root. | |
|
240 | ||
|
241 | Example: | |
|
242 | ||
|
243 | [merge-patterns] | |
|
244 | **.c = kdiff3 | |
|
245 | **.jpg = myimgmerge | |
|
246 | ||
|
247 | merge-tools:: | |
|
248 | This section configures external merge tools to use for file-level | |
|
249 | merges. | |
|
250 | ||
|
251 | Example ~/.hgrc: | |
|
252 | ||
|
253 | [merge-tools] | |
|
254 | # Override stock tool location | |
|
255 | kdiff3.executable = ~/bin/kdiff3 | |
|
256 | # Specify command line | |
|
257 | kdiff3.args = $base $local $other -o $output | |
|
258 | # Give higher priority | |
|
259 | kdiff3.priority = 1 | |
|
260 | ||
|
261 | # Define new tool | |
|
262 | myHtmlTool.args = -m $local $other $base $output | |
|
263 | myHtmlTool.regkey = Software\FooSoftware\HtmlMerge | |
|
264 | myHtmlTool.priority = 1 | |
|
265 | ||
|
266 | Supported arguments: | |
|
267 | priority;; | |
|
268 | The priority in which to evaluate this tool. | |
|
269 | Default: 0. | |
|
270 | executable;; | |
|
271 | Either just the name of the executable or its pathname. | |
|
272 | Default: the tool name. | |
|
273 | args;; | |
|
274 | The arguments to pass to the tool executable. You can refer to the files | |
|
275 | being merged as well as the output file through these variables: $base, | |
|
276 | $local, $other, $output. | |
|
277 | Default: $local $base $other | |
|
278 | premerge;; | |
|
279 | Attempt to run internal non-interactive 3-way merge tool before | |
|
280 | launching external tool. | |
|
281 | Default: True | |
|
282 | binary;; | |
|
283 | This tool can merge binary files. Defaults to False, unless tool | |
|
284 | was selected by file pattern match. | |
|
285 | symlink;; | |
|
286 | This tool can merge symlinks. Defaults to False, even if tool was | |
|
287 | selected by file pattern match. | |
|
288 | checkconflicts;; | |
|
289 | Check whether there are conflicts even though the tool reported | |
|
290 | success. | |
|
291 | Default: False | |
|
292 | fixeol;; | |
|
293 | Attempt to fix up EOL changes caused by the merge tool. | |
|
294 | Default: False | |
|
295 | gui:; | |
|
296 | This tool requires a graphical interface to run. Default: False | |
|
297 | regkey;; | |
|
298 | Windows registry key which describes install location of this tool. | |
|
299 | Mercurial will search for this key first under HKEY_CURRENT_USER and | |
|
300 | then under HKEY_LOCAL_MACHINE. Default: None | |
|
301 | regname;; | |
|
302 | Name of value to read from specified registry key. Defaults to the | |
|
303 | unnamed (default) value. | |
|
304 | regappend;; | |
|
305 | String to append to the value read from the registry, typically the | |
|
306 | executable name of the tool. Default: None | |
|
307 | ||
|
236 | 308 | hooks:: |
|
237 | 309 | Commands or Python functions that get automatically executed by |
|
238 | 310 | various actions such as starting or finishing a commit. Multiple |
@@ -467,7 +539,18 b' ui::' | |||
|
467 | 539 | Template string for commands that print changesets. |
|
468 | 540 | merge;; |
|
469 | 541 | The conflict resolution program to use during a manual merge. |
|
470 | Default is "hgmerge". | |
|
542 | There are some internal tools available: | |
|
543 | ||
|
544 | internal:local;; | |
|
545 | keep the local version | |
|
546 | internal:other;; | |
|
547 | use the other version | |
|
548 | internal:merge;; | |
|
549 | use the internal non-interactive merge tool | |
|
550 | internal:fail;; | |
|
551 | fail to merge | |
|
552 | ||
|
553 | See the merge-tools section for more information on configuring tools. | |
|
471 | 554 | patch;; |
|
472 | 555 | command to use to apply patches. Look for 'gpatch' or 'patch' in PATH if |
|
473 | 556 | unset. |
General Comments 0
You need to be logged in to leave comments.
Login now