[PATCH 3/9] Documentation: fix singular/plural mismatch
From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:47:29
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Sounds better this way, at least to my ears. ("syntax and
supported options of git merge" is a plural noun.)
Signed-off-by: Jonathan Nieder <redacted>
---
Documentation/config.txt | 2 +-
Documentation/git-merge.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index be0b8ca..4d01dde 100644
--- 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 - supported options are equal to that of linkgit:git-merge[1], but + supported options are equal to those of linkgit:git-merge[1], but option values containing whitespace characters are currently not supported.
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 354e9d9..6da07bb 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt@@ -50,7 +50,7 @@ include::merge-config.txt[] 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 + supported options are equal to those of 'git-merge', but option values containing whitespace characters are currently not supported. HOW MERGE WORKS
--
1.6.5.rc1.199.g596ec