diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-10-23 01:23:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-10-23 01:23:31 +0000 |
| commit | 764a667a8f360cfaafc6bfa9a0b5a2f09ed47586 (patch) | |
| tree | fc6f7da163a804cc8aef905924828d69b897399a /git-merge-index.html | |
| parent | ea719cf8b709e1b5c43d18ca26832f8c9bf11e7e (diff) | |
| download | git-htmldocs-764a667a8f360cfaafc6bfa9a0b5a2f09ed47586.tar.gz | |
Autogenerated HTML docs for v1.5.3.4-319-gdd817
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 1dbcc2f8d..ab6549c03 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -325,7 +325,7 @@ files are passed as arguments 5, 6 and 7.</p> <p>If "git-merge-index" is called with multiple <file>s (or -a) then it
processes them in turn only stopping if merge returns a non-zero exit
code.</p>
-<p>Typically this is run with the a script calling git's imitation of
+<p>Typically this is run with a script calling git's imitation of
the merge command from the RCS package.</p>
<p>A sample script called "git-merge-one-file" is included in the
distribution.</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 19-Jul-2007 02:09:46 UTC
+Last updated 23-Oct-2007 01:21:51 UTC
</div>
</div>
</body>
|