Documentation: fix and clarify grammar in git-merge docs.
Signed-off-by: Dave Peticolas <dave@krondo.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Dave Peticolas committed
Jan 15, 2008 at 21:16 UTC
b98525e4bf1c3587bc57ad982d616dbe174c6e23
1 file changed
+6
-6
Documentation/git-merge.txt
+6
-6
@@ -74,14 +74,14 @@ it happens. In other words, `git-diff --cached HEAD` must
74
report no changes.
75
76
[NOTE]
77
-This is a bit of lie. In certain special cases, your index are
78
-allowed to be different from the tree of `HEAD` commit. The most
77
+This is a bit of a lie. In certain special cases, your index is
78
+allowed to be different from the tree of the `HEAD` commit. The most
79
notable case is when your `HEAD` commit is already ahead of what
80
is being merged, in which case your index can have arbitrary
81
-difference from your `HEAD` commit. Otherwise, your index entries
82
-are allowed have differences from your `HEAD` commit that match
83
-the result of trivial merge (e.g. you received the same patch
84
-from external source to produce the same result as what you are
81
+differences from your `HEAD` commit. Also, your index entries
82
+may have differences from your `HEAD` commit that match
83
+the result of a trivial merge (e.g. you received the same patch
84
+from an external source to produce the same result as what you are
85
merging). For example, if a path did not exist in the common
86
ancestor and your head commit but exists in the tree you are
87
merging into your repository, and if you already happen to have