]> git.ipfire.org Git - thirdparty/git.git/commit
doc: fix singular/plural mismatch in git-rerere
authorElijah Newren <newren@gmail.com>
Thu, 16 Apr 2026 23:36:30 +0000 (23:36 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Apr 2026 04:22:01 +0000 (21:22 -0700)
commit60e8015d233a2431e75dcb832dcd5be5368ae452
tree7e552a543594341345a976592057010bf773dfbb
parent31f23c958be7f727ece4ce0db8b7ddbf1dfb3f79
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>
Documentation/git-rerere.adoc