diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-21 19:27:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-21 19:27:13 -0700 |
| commit | e3f080d1c1d091db97eb840de39a5245a3c82f3e (patch) | |
| tree | 2d5821021b314217f92f1826b1c4100e809c8f82 /git-merge-index.html | |
| parent | 7692782cd994796eb7bd0bed592669c5090289bb (diff) | |
| download | git-htmldocs-e3f080d1c1d091db97eb840de39a5245a3c82f3e.tar.gz | |
Autogenerated HTML docs for v1.8.2.1-538-gad776
Diffstat (limited to 'git-merge-index.html')
| -rw-r--r-- | git-merge-index.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-index.html b/git-merge-index.html index f7ac301c0..f7075c2be 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -755,7 +755,7 @@ git-merge-index(1) Manual Page <h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>This looks up the <file>(s) in the index and, if there are any merge
-entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty
+entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty
argument if no file), and <file> as argument 4. File modes for the three
files are passed as arguments 5, 6 and 7.</p></div>
</div>
@@ -848,7 +848,7 @@ for the AA file, because it didn’t exist in the original, and thus <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
|