summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorHorst H. von Brand <vonbrand@inf.utfsm.cl>2006-06-03 16:27:26 -0400
committerJunio C Hamano <junkio@cox.net>2006-06-03 23:54:55 -0700
commitabda1ef590d94a5e15e7ce3b685b5c092a790cfa (patch)
tree73162a92b2abd5d87b86566899e321dd8ccef59c /Documentation/git-merge-index.txt
parent895f10c3b596ef955c7f252717e5b4668530c569 (diff)
downloadgit-abda1ef590d94a5e15e7ce3b685b5c092a790cfa.tar.gz
Documentation: Spelling fixes
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge-index.txt')
-rw-r--r--Documentation/git-merge-index.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 332e023d0f..6cd0601082 100644
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/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).