diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-23 21:35:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-23 21:35:38 -0700 |
| commit | 44dcd493a7896aabe2b48b0a2935633538d81f7c (patch) | |
| tree | 55fb9bfad3faa4309b5e1c0781f78d635c6dbd3b /git-merge.html | |
| parent | bb300643ea913f58d836780e949b1ebcce8da530 (diff) | |
| download | git-htmldocs-44dcd493a7896aabe2b48b0a2935633538d81f7c.tar.gz | |
Autogenerated HTML docs for v1.7.12-rc0
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 316fc08d4..3c94d55df 100644 --- a/git-merge.html +++ b/git-merge.html @@ -971,7 +971,7 @@ other side left that area intact, or vice versa) are incorporated in the final result verbatim. When both sides made changes to the same area,
however, git cannot randomly pick one side over the other, and asks you to
resolve it by leaving what both sides did to that area.</p></div>
-<div class="paragraph"><p>By default, git uses the same style as that is used by "merge" program
+<div class="paragraph"><p>By default, git uses the same style as the one used by the "merge" program
from the RCS suite to present such a conflicted hunk, like this:</p></div>
<div class="listingblock">
<div class="content">
@@ -1475,7 +1475,7 @@ branch.<name>.mergeoptions <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-02-01 17:36:24 PDT
+Last updated 2012-07-23 21:34:17 PDT
</div>
</div>
</body>
|