Mercurial > hg

comparison tests/test-help.t @ 32245:3a755652ce3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 12 May 2017 11:20:25 -0700
parents 247bb7a2c492
children 7e35d31b41fd
comparison
equal deleted inserted replaced
32244:3de4c61b5087 32245:3a755652ce3a
1829 section, the one with the highest priority is used. 1829 section, the one with the highest priority is used.
1830 6. If a program named "hgmerge" can be found on the system, it is used - 1830 6. If a program named "hgmerge" can be found on the system, it is used -
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
1838 merge the files using a simple merge algorithm first. Only if it 1838 merge the files using a simple merge algorithm first. Only if it
1839 doesn't succeed because of conflicting changes Mercurial will actually 1839 doesn't succeed because of conflicting changes Mercurial will actually