Autogenerated HTML docs for v2.14.1-536-g68672

1 files changed, 3 insertions, 3 deletions

diff --git a/git-merge.html b/git-merge.html
index 88a65b030..1cc524446 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -870,7 +870,7 @@ set to <code>no</code> at the beginning of them.</p></div>
 <dd>

 <p>

         Refuse to merge and exit with a non-zero status unless the

-        current <code>HEAD</code> is already up-to-date or the merge can be

+        current <code>HEAD</code> is already up to date or the merge can be

         resolved as a fast-forward.

 </p>

 </dd>

@@ -1136,7 +1136,7 @@ registered in the index relative to the <code>HEAD</code> commit.  (One
 exception is when the changed index entries are in the state that

 would result from the merge already.)</p></div>

 <div class="paragraph"><p>If all named commits are already ancestors of <code>HEAD</code>, <em>git merge</em>

-will exit early with the message "Already up-to-date."</p></div>

+will exit early with the message "Already up to date."</p></div>

 </div>

 </div>

 <div class="sect1">

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

 <div id="footer">

 <div id="footer-text">

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

+Last updated 2017-09-10 17:38:46 JST

 </div>

 </div>

 </body>