Merge branch 'cb/maint-unpack-trees-absense' into maint

[git.git] / Documentation / git-merge-index.txt

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 5ebed57be3ee030f27310562e004a26c730420e8..123e6d024a47537981526d0c078249565e72d74f 100644 (file)
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -29,11 +29,11 @@ OPTIONS
        Instead of stopping at the first failed merge, do all of them
        in one shot - continue with merging even when previous merges
        returned errors, and only return the error code after all the
-       merges are over.
+       merges.
 
 -q::
-       Do not complain about failed merge program (the merge program
-       failure usually indicates conflicts during merge). This is for
+       Do not complain about a failed merge program (a merge program
+       failure usually indicates conflicts during the merge). This is for
        porcelains which might want to emit custom messages.
 
 If 'git-merge-index' is called with multiple <file>s (or -a) then it
@@ -47,9 +47,9 @@ A sample script called 'git-merge-one-file' is included in the
 distribution.
 
 ALERT ALERT ALERT! The git "merge object order" is different from the
-RCS `merge` program merge object order. In the above ordering, the
+RCS 'merge' program merge object order. In the above ordering, the
 original is first. But the argument order to the 3-way merge program
-`merge` is to have the original in the middle. Don't ask me why.
+'merge' is to have the original in the middle. Don't ask me why.
 
 Examples: