diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-17 14:34:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 14:34:00 -0700 |
| commit | e6f28d0b6c239f15760194c8b12afdaa1a7bdd34 (patch) | |
| tree | b782d1e78feb1a9f17131581d754b0e29abaa0b8 /git-merge-tree.html | |
| parent | 0e0e0d2656a57fd3628bb6dbdaf0096684ed24a9 (diff) | |
| download | git-htmldocs-e6f28d0b6c239f15760194c8b12afdaa1a7bdd34.tar.gz | |
Autogenerated HTML docs for v1.8.4-357-g8d83
Diffstat (limited to 'git-merge-tree.html')
| -rw-r--r-- | git-merge-tree.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-tree.html b/git-merge-tree.html index c656ed194..181e8c9ca 100644 --- a/git-merge-tree.html +++ b/git-merge-tree.html @@ -754,7 +754,7 @@ git-merge-tree(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Reads three treeish, and output trivial merge results and
+<div class="paragraph"><p>Reads three tree-ish, and output trivial merge results and
conflicting stages to the standard output. This is similar to
what three-way <em>git read-tree -m</em> does, but instead of storing the
results in the index, the command outputs the entries to the
@@ -775,7 +775,7 @@ entries that match the <branch1> tree.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2013-09-17 14:33:14 PDT
</div>
</div>
</body>
|