aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-10-25 17:11:38 -0700
committerJunio C Hamano <gitster@pobox.com>2022-10-25 17:11:38 -0700
commitb30a4435ed0e96212f6023cb7a952b95a58de818 (patch)
tree45ae507cb2c5101498c13133f0b064bdc3dd4696 /diff.c
parentMerge branch 'jk/sequencer-missing-author-name-check' into maint-2.38 (diff)
parentmergetool.txt: typofix 'overwriten' -> 'overwritten' (diff)
downloadgit-b30a4435ed0e96212f6023cb7a952b95a58de818.tar.gz
git-b30a4435ed0e96212f6023cb7a952b95a58de818.zip
Merge branch 'nb/doc-mergetool-typofix' into maint-2.38
Typofix. * nb/doc-mergetool-typofix: mergetool.txt: typofix 'overwriten' -> 'overwritten'
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions