提交 28cb0602 编写于 作者: M Meng-Sung Wu 提交者: Junio C Hamano

doc: update the order of the syntax `git merge --continue`

The syntax "git merge <message> HEAD <commit>" has been removed. The
order of the syntax should also be updated.
Signed-off-by: NMeng-Sung Wu <mengsungwu@fortunewhite.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 1fdbfc44
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册