Show More
@@ -70,7 +70,7 b' 6. If a program named ``hgmerge`` can be' | |||||
70 | 7. If the file to be merged is not binary and is not a symlink, then |
|
70 | 7. If the file to be merged is not binary and is not a symlink, then | |
71 | internal ``:merge`` is used. |
|
71 | internal ``:merge`` is used. | |
72 |
|
72 | |||
73 | 8. The merge of the file fails and must be resolved before commit. |
|
73 | 8. Otherwise, ``:prompt`` is used. | |
74 |
|
74 | |||
75 | .. note:: |
|
75 | .. note:: | |
76 |
|
76 |
@@ -1831,7 +1831,7 b' Test dynamic list of merge tools only sh' | |||||
1831 | but it will by default not be used for symlinks and binary files. |
|
1831 | but it will by default not be used for symlinks and binary files. | |
1832 | 7. If the file to be merged is not binary and is not a symlink, then |
|
1832 | 7. If the file to be merged is not binary and is not a symlink, then | |
1833 | internal ":merge" is used. |
|
1833 | internal ":merge" is used. | |
1834 | 8. The merge of the file fails and must be resolved before commit. |
|
1834 | 8. Otherwise, ":prompt" is used. | |
1835 |
|
1835 | |||
1836 | Note: |
|
1836 | Note: | |
1837 | After selecting a merge program, Mercurial will by default attempt to |
|
1837 | After selecting a merge program, Mercurial will by default attempt to |
General Comments 0
You need to be logged in to leave comments.
Login now