Mercurial > hg

comparison mercurial/help/merge-tools.txt @ 12838:830be2c57626 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: improve wording of internal:merge and internal:fail
author Steve Borho <steve@borho.org>
date Mon, 25 Oct 2010 14:34:49 -0500
parents 4d622380ab39
children 6eec9d7c6e0f
comparison
equal deleted inserted replaced
12837:c82056f2509f 12838:830be2c57626
33 33
34 There are a some internal merge tools which can be used. The internal 34 There are a some internal merge tools which can be used. The internal
35 merge tools are: 35 merge tools are:
36 36
37 ``internal:merge`` 37 ``internal:merge``
38 Uses the internal non-interactive simple merge algorithm for merging files. 38 Uses the internal non-interactive simple merge algorithm for merging
39 It will fail if there are any conflicts. 39 files. It will fail if there are any conflicts and leave markers in
40 the partially merged file.
40 41
41 ``internal:fail`` 42 ``internal:fail``
42 Rather than attempting to merge files that were modified on both 43 Rather than attempting to merge files that were modified on both
43 branches, it marks these files as unresolved. Then the resolve 44 branches, it marks them as unresolved. The resolve command must be
44 command must be used to mark files resolved. 45 used to resolve these conflicts.
45 46
46 ``internal:local`` 47 ``internal:local``
47 Uses the local version of files as the merged version. 48 Uses the local version of files as the merged version.
48 49
49 ``internal:other`` 50 ``internal:other``