Documentation: clarify mergeoptions description

Sounds better this way, at least to my ears.  ("The syntax and
supported options of git merge" is a plural noun.  "the same"
instead of "equal" sounds less technical and seems to convey
the meaning better here.)

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index be0b8cacaa17234a2f2d3da50b63df7ff272d468..cd1781498eb92d7dd0d3648a8fe188fc75a6df8c 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -539,7 +539,7 @@ branch.<name>.merge::
 
 branch.<name>.mergeoptions::
        Sets default options for merging into branch <name>. The syntax and
 
 branch.<name>.mergeoptions::
        Sets default options for merging into branch <name>. The syntax and

-       supported options are equal to that of linkgit:git-merge[1], but
+       supported options are the same as those of linkgit:git-merge[1], but

        option values containing whitespace characters are currently not
        supported.
 
        option values containing whitespace characters are currently not
        supported.
 

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index ac9f17a11ed0456205f3fa1c72f48906bb16eb25..d05f324462d23f64ba9563666e555a9eee3c443f 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -50,8 +50,8 @@ include::merge-config.txt[]
 
 branch.<name>.mergeoptions::
        Sets default options for merging into branch <name>. The syntax and
 
 branch.<name>.mergeoptions::
        Sets default options for merging into branch <name>. The syntax and

-       supported options are equal to that of 'git-merge', but option values
-       containing whitespace characters are currently not supported.
+       supported options are the same as those of 'git merge', but option
+       values containing whitespace characters are currently not supported.

 
 HOW MERGE WORKS
 ---------------
 
 HOW MERGE WORKS
 ---------------