Autogenerated HTML docs for v2.14.1-459-g238e4

1 files changed, 5 insertions, 2 deletions

diff --git a/git-merge.html b/git-merge.html
index 24af24708..88a65b030 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -1301,7 +1301,10 @@ Decide not to merge.  The only clean-ups you need are to reset
 <p>

 Resolve the conflicts.  Git will mark the conflicts in

    the working tree.  Edit the files into shape and

-   <em>git add</em> them to the index.  Use <em>git commit</em> to seal the deal.

+   <em>git add</em> them to the index.  Use <em>git commit</em> or

+   <em>git merge --continue</em> to seal the deal. The latter command

+   checks whether there is a (interrupted) merge in progress

+   before calling <em>git commit</em>.

 </p>

 </li>

 </ul></div>

@@ -1921,7 +1924,7 @@ branch.&lt;name&gt;.mergeOptions
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2017-08-24 11:09:12 PDT

+Last updated 2017-08-26 23:14:22 PDT

 </div>

 </div>

 </body>