diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-03-28 08:55:34 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-03-28 08:55:34 +0000 |
| commit | 36a567279a3e94474750eacd210f308ef21d446e (patch) | |
| tree | b26a9c8bab6824ff98c99dca17eafb3cc022ad28 /git-merge.html | |
| parent | 1de7572eb1aa483cc2aaca1db274928ffc6830f0 (diff) | |
| download | git-htmldocs-36a567279a3e94474750eacd210f308ef21d446e.tar.gz | |
Autogenerated HTML docs for v1.6.2.1-404-gb008
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 47591f1b9..56e38561d 100644 --- a/git-merge.html +++ b/git-merge.html @@ -576,7 +576,7 @@ subtree </p>
</dd>
</dl></div>
-<div class="para"><p>If you tried a merge which resulted in a complex conflicts and
+<div class="para"><p>If you tried a merge which resulted in complex conflicts and
want to start over, you can recover with <em>git-reset</em>.</p></div>
</div>
<h2 id="_configuration">CONFIGURATION</h2>
@@ -920,7 +920,7 @@ Look at the originals. <em>git show :1:filename</em> shows the </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-03-26 08:39:13 UTC
+Last updated 2009-03-28 08:55:22 UTC
</div>
</div>
</body>
|