diff options
| author | Elijah Newren <newren@gmail.com> | 2026-04-16 23:36:30 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-04-16 21:22:01 -0700 |
| commit | 60e8015d233a2431e75dcb832dcd5be5368ae452 (patch) | |
| tree | 7e552a543594341345a976592057010bf773dfbb /t/t4013/diff.format-patch_--inline_--stdout_initial..main^ | |
| parent | 31f23c958be7f727ece4ce0db8b7ddbf1dfb3f79 (diff) | |
| download | git-60e8015d233a2431e75dcb832dcd5be5368ae452.tar.gz git-60e8015d233a2431e75dcb832dcd5be5368ae452.zip | |
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>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..main^')
0 files changed, 0 insertions, 0 deletions
