From: Elijah Newren <newren@gmail.com>
Date: Thu, 16 Apr 2026 23:36:30 +0000 (+0000)
Subject: doc: fix singular/plural mismatch in git-rerere
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60e8015d233a2431e75dcb832dcd5be5368ae452;p=thirdparty%2Fgit.git

doc: fix singular/plural mismatch in git-rerere

conflict -> conflicts

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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'::