diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-05-05 23:14:25 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-05-05 23:14:25 +0000 |
| commit | 1bb569ec8189e0498dc17c57e9237ffd85beb273 (patch) | |
| tree | 810ac97c3b91652af2e900f2779e111965c4984d /git-merge-index.html | |
| parent | 88a3a070894a23a10133fee89065cb27199cf58b (diff) | |
| download | git-htmldocs-1bb569ec8189e0498dc17c57e9237ffd85beb273.tar.gz | |
Autogenerated HTML docs for v1.3.2-g8611
Diffstat (limited to 'git-merge-index.html')
| -rw-r--r-- | git-merge-index.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-merge-index.html b/git-merge-index.html index 28b50e4a6..f2235fea3 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -272,7 +272,7 @@ git-merge-index(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git-merge-index</em> [-o] [-q] <merge-program> (-a | — | <file>*)</p>
+<p><em>git-merge-index</em> [-o] [-q] <merge-program> (-a | -- | <file>*)</p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -285,7 +285,7 @@ files are passed as arguments 5, 6 and 7.</p> <div class="sectionbody">
<dl>
<dt>
-—
+--
</dt>
<dd>
<p>
@@ -372,7 +372,7 @@ One-shot merge by Petr Baudis <pasky@ucw.cz></p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 27-Dec-2005 00:16:20 PDT
+Last updated 05-May-2006 23:14:13 UTC
</div>
</div>
</body>
|