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>
Jonathan Nieder committed
Oct 9, 2009 at 13:51 UTC
25dcc0d64b9f3c11abcd0f53a9b9cdb6092ed646
2 files changed
+3
-3
Documentation/config.txt
+1
-1
@@ -539,7 +539,7 @@ branch.<name>.merge::
539
540
branch.<name>.mergeoptions::
541
Sets default options for merging into branch <name>. The syntax and
542
- supported options are equal to that of linkgit:git-merge[1], but
542
+ supported options are the same as those of linkgit:git-merge[1], but
543
option values containing whitespace characters are currently not
544
supported.
545
Documentation/git-merge.txt
+2
-2
@@ -50,8 +50,8 @@ include::merge-config.txt[]
50
51
branch.<name>.mergeoptions::
52
Sets default options for merging into branch <name>. The syntax and
53
- supported options are equal to that of 'git-merge', but option values
54
- containing whitespace characters are currently not supported.
53
+ supported options are the same as those of 'git merge', but option
54
+ values containing whitespace characters are currently not supported.
55
56
HOW MERGE WORKS
57
---------------