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: Meng-Sung Wu <mengsungwu@fortunewhite.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Meng-Sung Wu committed
Jun 14, 2018 at 09:33 UTC
28cb06020bc86eea46288c29673ac108c3944089
1 file changed
+1
-1
Documentation/git-merge.txt
+1
-1
@@ -57,7 +57,7 @@ reconstruct the original (pre-merge) changes. Therefore:
57
discouraged: while possible, it may leave you in a state that is hard to
58
back out of in the case of a conflict.
59
60
-The fourth syntax ("`git merge --continue`") can only be run after the
60
+The third syntax ("`git merge --continue`") can only be run after the
61
merge has resulted in conflicts.
62
63
OPTIONS