From: Elijah Newren via GitGitGadget Date: Thu, 16 Apr 2026 23:36:30 GMT Subject: [PATCH 5/6] doc: fix singular/plural mismatch in git-rerere Message-ID: <93e1556bd86a55501f6894f22d2c1b47fe464dba.1776382591.git.gitgitgadget@gmail.com> In-Reply-To: From: Elijah Newren conflict -> conflicts Signed-off-by: Elijah Newren --- 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' :: Reset the conflict resolutions which rerere has recorded for the current -conflict in paths that match . +conflicts in paths that match . 'diff':: -- gitgitgadget