Merge branch 'sr/blame-incomplete'

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

diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 1276f858ade29bec40716d19cf56fe6e3882fc25..4365b7e8420fa96d6cbfa14a5aa49d956ba2de16 100644 (file)
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -3,15 +3,15 @@ MERGE STRATEGIES
 
 resolve::
        This can only resolve two heads (i.e. the current branch
 
 resolve::
        This can only resolve two heads (i.e. the current branch

-       and another branch you pulled from) using 3-way merge
+       and another branch you pulled from) using a 3-way merge

        algorithm.  It tries to carefully detect criss-cross
        merge ambiguities and is considered generally safe and
        fast.
 
 recursive::
        algorithm.  It tries to carefully detect criss-cross
        merge ambiguities and is considered generally safe and
        fast.
 
 recursive::

-       This can only resolve two heads using 3-way merge
-       algorithm.  When there are more than one common
-       ancestors that can be used for 3-way merge, it creates a
+       This can only resolve two heads using a 3-way merge
+       algorithm.  When there is more than one common
+       ancestor that can be used for 3-way merge, it creates a

        merged tree of the common ancestors and uses that as
        the reference tree for the 3-way merge.  This has been
        reported to result in fewer merge conflicts without
        merged tree of the common ancestors and uses that as
        the reference tree for the 3-way merge.  This has been
        reported to result in fewer merge conflicts without


@@ -22,11 +22,11 @@ recursive::
        pulling or merging one branch.
 
 octopus::
        pulling or merging one branch.
 
 octopus::

-       This resolves more than two-head case, but refuses to do
-       complex merge that needs manual resolution.  It is
+       This resolves cases with more than two heads, but refuses to do
+       a complex merge that needs manual resolution.  It is

        primarily meant to be used for bundling topic branch
        heads together.  This is the default merge strategy when
        primarily meant to be used for bundling topic branch
        heads together.  This is the default merge strategy when

-       pulling or merging more than one branches.
+       pulling or merging more than one branch.

 
 ours::
        This resolves any number of heads, but the result of the
 
 ours::
        This resolves any number of heads, but the result of the