From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Jun 2018 17:18:45 +0000 (-0700)
Subject: Merge branch 'mw/doc-merge-enumfix'
X-Git-Tag: v2.18.0~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/23fc55a90c0956908cb595789b460179c062153b?hp=-c

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`
---

23fc55a90c0956908cb595789b460179c062153b
diff --combined Documentation/git-merge.txt
index d5dfd8430f,4a565a15e4..6a5c00e2c2
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@@ -57,13 -57,19 +57,13 @@@ reconstruct the original (pre-merge) ch
  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
  -------
  include::merge-options.txt[]
  
 --S[<keyid>]::
 ---gpg-sign[=<keyid>]::
 -	GPG-sign the resulting merge commit. The `keyid` argument is
 -	optional and defaults to the committer identity; if specified,
 -	it must be stuck to the option without a space.
 -
  -m <msg>::
  	Set the commit message to be used for the merge commit (in
  	case one is created).
@@@ -127,7 -133,7 +127,7 @@@ exception is when the changed index ent
  would result from the merge already.)
  
  If all named commits are already ancestors of `HEAD`, 'git merge'
 -will exit early with the message "Already up-to-date."
 +will exit early with the message "Already up to date."
  
  FAST-FORWARD MERGE
  ------------------
@@@ -274,10 -280,7 +274,10 @@@ After seeing a conflict, you can do tw
  
   * Resolve the conflicts.  Git will mark the conflicts in
     the working tree.  Edit the files into shape and
 -   'git add' them to the index.  Use 'git commit' to seal the deal.
 +   'git add' them to the index.  Use 'git commit' or
 +   'git merge --continue' to seal the deal. The latter command
 +   checks whether there is a (interrupted) merge in progress
 +   before calling 'git commit'.
  
  You can work through the conflict with a number of tools: