Mercurial > hg
comparison mercurial/help/merge-tools.txt @ 16126:0c4bec9596d8
filemerge: create detail of internal merge tools from documentation string
this patch introduces 'internaltoolsmarker' which creates detail of
each internal merge tools from documentation string for 'hg help merge-tools'.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sun, 12 Feb 2012 21:38:12 +0900 |
parents | 6eec9d7c6e0f |
children | 979b107eaea2 |
comparison
equal
deleted
inserted
replaced
16125:83925d3a4559 | 16126:0c4bec9596d8 |
---|---|
32 GUI is available if the tool requires a GUI. | 32 GUI is available if the tool requires a GUI. |
33 | 33 |
34 There are some internal merge tools which can be used. The internal | 34 There are some internal merge tools which can be used. The internal |
35 merge tools are: | 35 merge tools are: |
36 | 36 |
37 ``internal:merge`` | 37 .. internaltoolsmarker |
38 Uses the internal non-interactive simple merge algorithm for merging | |
39 files. It will fail if there are any conflicts and leave markers in | |
40 the partially merged file. | |
41 | |
42 ``internal:fail`` | |
43 Rather than attempting to merge files that were modified on both | |
44 branches, it marks them as unresolved. The resolve command must be | |
45 used to resolve these conflicts. | |
46 | |
47 ``internal:local`` | |
48 Uses the local version of files as the merged version. | |
49 | |
50 ``internal:other`` | |
51 Uses the other version of files as the merged version. | |
52 | |
53 ``internal:prompt`` | |
54 Asks the user which of the local or the other version to keep as | |
55 the merged version. | |
56 | |
57 ``internal:dump`` | |
58 Creates three versions of the files to merge, containing the | |
59 contents of local, other and base. These files can then be used to | |
60 perform a merge manually. If the file to be merged is named | |
61 ``a.txt``, these files will accordingly be named ``a.txt.local``, | |
62 ``a.txt.other`` and ``a.txt.base`` and they will be placed in the | |
63 same directory as ``a.txt``. | |
64 | 38 |
65 Internal tools are always available and do not require a GUI but will by default | 39 Internal tools are always available and do not require a GUI but will by default |
66 not handle symlinks or binary files. | 40 not handle symlinks or binary files. |
67 | 41 |
68 Choosing a merge tool | 42 Choosing a merge tool |