diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-18 11:32:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-18 11:32:19 -0700 |
| commit | 14e6683c9ffe288fd03fe38170e3d255056a7841 (patch) | |
| tree | a3248ef8aa66bb4132fd6442a25d39a151b8173b /git-merge.html | |
| parent | 49bcf742a2710071f132cc7efcad8c4f4d7f0984 (diff) | |
| download | git-htmldocs-14e6683c9ffe288fd03fe38170e3d255056a7841.tar.gz | |
Autogenerated HTML docs for v2.18.0-rc2-76-g242ba
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge.html b/git-merge.html index 9165463af..0a696a16d 100644 --- a/git-merge.html +++ b/git-merge.html @@ -796,7 +796,7 @@ reconstruct the original (pre-merge) changes. Therefore:</p></div> <div class="paragraph"><p><strong>Warning</strong>: Running <em>git merge</em> with non-trivial uncommitted changes is
discouraged: while possible, it may leave you in a state that is hard to
back out of in the case of a conflict.</p></div>
-<div class="paragraph"><p>The fourth syntax ("<code>git merge --continue</code>") can only be run after the
+<div class="paragraph"><p>The third syntax ("<code>git merge --continue</code>") can only be run after the
merge has resulted in conflicts.</p></div>
</div>
</div>
@@ -1963,7 +1963,7 @@ branch.<name>.mergeOptions <div id="footer">
<div id="footer-text">
Last updated
- 2018-01-26 15:11:04 PST
+ 2018-06-18 11:31:52 PDT
</div>
</div>
</body>
|