[PATCH 5/6] doc: fix singular/plural mismatch in git-rerere
From: Elijah Newren <newren@gmail.com>
conflict -> conflicts
Signed-off-by: Elijah Newren <newren@gmail.com>
---
Documentation/git-rerere.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-rerere.adoc b/Documentation/git-rerere.adoc
index 99f967b7a4..4e6ab9a27c 100644
--- a/Documentation/git-rerere.adoc
+++ b/Documentation/git-rerere.adoc
@@ -44,7 +44,7 @@ will automatically invoke this command.
'forget' <pathspec>::
Reset the conflict resolutions which rerere has recorded for the current
-conflict in paths that match <pathspec>.
+conflicts in paths that match <pathspec>.
'diff'::
--
gitgitgadget