From: horst.h.von.brand@inf.utfsm.cl Date: Sat, 03 Jun 2006 20:27:13 GMT Subject: [PATCH 14/27] Documentation: Spelling fixes Message-ID: <49814.4913385206$1149366516@news.gmane.org> In-Reply-To: <11493664773328-git-send-email-> From: Horst H. von Brand Signed-off-by: Horst H. von Brand --- Documentation/git-merge-index.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 332e023..6cd0601 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). -- 1.3.3.g86f7