X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=git-merge-index.txt;h=6cd060108292733725aca28cc8f0b83aa7d0f56e;hb=f0a85daaf3d624dcf841cad8d5d243e6da55ea70;hp=332e023d0f14be813ead6cb6915938910ea3a719;hpb=1bb569ec8189e0498dc17c57e9237ffd85beb273;p=git.git

diff --git a/git-merge-index.txt b/git-merge-index.txt
index 332e023d..6cd06010 100644
--- a/git-merge-index.txt
+++ b/git-merge-index.txt
@@ -69,7 +69,7 @@ or
   fatal: merge program failed
 
 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).