Mercurial > hg

diff 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
line wrap: on
line diff
--- a/tests/test-help.t	Tue Oct 31 22:37:30 2017 +0900
+++ b/tests/test-help.t	Tue Oct 31 23:09:29 2017 -0400
@@ -1876,7 +1876,7 @@
       Note:
          After selecting a merge program, Mercurial will by default attempt to
          merge the files using a simple merge algorithm first. Only if it
-         doesn't succeed because of conflicting changes Mercurial will actually
+         doesn't succeed because of conflicting changes will Mercurial actually
          execute the merge program. Whether to use the simple merge algorithm
          first can be controlled by the premerge setting of the merge tool.
          Premerge is enabled by default unless the file is binary or a symlink.