Commit 23fc55a9 authored by Junio C Hamano's avatar Junio C Hamano

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`
parents f72432d6 28cb0602
......@@ -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.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment