Mercurial > hg

comparison tests/test-help.t @ 34948:ff178743e59b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: minor copy editing for grammar
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 31 Oct 2017 23:09:29 -0400
parents fd78276948b4
children 05ebb553bd03
comparison
equal deleted inserted replaced
34947:ff2110eadbfa 34948:ff178743e59b
1874 8. Otherwise, ":prompt" is used. 1874 8. Otherwise, ":prompt" is used.
1875 1875
1876 Note: 1876 Note:
1877 After selecting a merge program, Mercurial will by default attempt to 1877 After selecting a merge program, Mercurial will by default attempt to
1878 merge the files using a simple merge algorithm first. Only if it 1878 merge the files using a simple merge algorithm first. Only if it
1879 doesn't succeed because of conflicting changes Mercurial will actually 1879 doesn't succeed because of conflicting changes will Mercurial actually
1880 execute the merge program. Whether to use the simple merge algorithm 1880 execute the merge program. Whether to use the simple merge algorithm
1881 first can be controlled by the premerge setting of the merge tool. 1881 first can be controlled by the premerge setting of the merge tool.
1882 Premerge is enabled by default unless the file is binary or a symlink. 1882 Premerge is enabled by default unless the file is binary or a symlink.
1883 1883
1884 See the merge-tools and ui sections of hgrc(5) for details on the 1884 See the merge-tools and ui sections of hgrc(5) for details on the