Merge branch 'mw/doc-merge-enumfix'

Fix old merge glitch in Documentation during v2.13-rc0 era.

* mw/doc-merge-enumfix:
doc: update the order of the syntax `git merge --continue`

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index d5dfd8430f3370dc168e42e3991d1d4a9b854617..6a5c00e2c2b5b5201e42e12b74d8ae5128ce9c93 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -57,7 +57,7 @@ reconstruct the original (pre-merge) changes. Therefore:
 discouraged: while possible, it may leave you in a state that is hard to
 back out of in the case of a conflict.
 
-The fourth syntax ("`git merge --continue`") can only be run after the
+The third syntax ("`git merge --continue`") can only be run after the
 merge has resulted in conflicts.
 
 OPTIONS