equal
deleted
inserted
replaced
68 it will by default not be used for symlinks and binary files. |
68 it will by default not be used for symlinks and binary files. |
69 |
69 |
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 |
77 After selecting a merge program, Mercurial will by default attempt |
77 After selecting a merge program, Mercurial will by default attempt |
78 to merge the files using a simple merge algorithm first. Only if it doesn't |
78 to merge the files using a simple merge algorithm first. Only if it doesn't |