diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-06-04 07:24:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-06-04 07:24:48 +0000 |
| commit | 341071d878757c06a3931db660fe318effc8317e (patch) | |
| tree | 8cb7bf28351c062adbe71172b942a3228d40725d /git-merge-index.html | |
| parent | bb8fb05ed082c81af81f9eecf356f993e2ef83b7 (diff) | |
| download | git-htmldocs-341071d878757c06a3931db660fe318effc8317e.tar.gz | |
Autogenerated HTML docs for v1.3.3-g16a4
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 f2235fea3..193abe796 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -353,7 +353,7 @@ This is added AA in the branch B. fatal: merge program failed</tt></pre>
</div></div>
<p>where the latter example shows how "git-merge-index" will stop trying to
-merge once anything has returned an error (ie "cat" returned an error
+merge once anything has returned an error (i.e., "cat" returned an error
for the AA file, because it didn't exist in the original, and thus
"git-merge-index" didn't even try to merge the MM thing).</p>
</div>
@@ -372,7 +372,7 @@ One-shot merge by Petr Baudis <pasky@ucw.cz></p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 05-May-2006 23:14:13 UTC
+Last updated 04-Jun-2006 07:24:28 UTC
</div>
</div>
</body>
|