Mercurial > hg

comparison mercurial/help/merge-tools.txt @ 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 247bb7a2c492
children 7c6044634957
comparison
equal deleted inserted replaced
34947:ff2110eadbfa 34948:ff178743e59b
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
79 succeed because of conflicting changes Mercurial will actually execute the 79 succeed because of conflicting changes will Mercurial actually execute the
80 merge program. Whether to use the simple merge algorithm first can be 80 merge program. Whether to use the simple merge algorithm first can be
81 controlled by the premerge setting of the merge tool. Premerge is enabled by 81 controlled by the premerge setting of the merge tool. Premerge is enabled by
82 default unless the file is binary or a symlink. 82 default unless the file is binary or a symlink.
83 83
84 See the merge-tools and ui sections of hgrc(5) for details on the 84 See the merge-tools and ui sections of hgrc(5) for details on the