summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-11-11 13:18:38 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-11 13:18:38 -0800
commit8d9e92b06b704a23b9e6d1e58ede04f5cb1e42f6 (patch)
tree95f3517c1b3cffd837415e7c3ea6157e06bcc20d /merge.c
parentMerge branch 'jc/abbrev-doc' (diff)
parentdoc: fixing two trivial typos in Documentation/ (diff)
downloadtgif-8d9e92b06b704a23b9e6d1e58ede04f5cb1e42f6.tar.xz
Merge branch 'mc/typofix'
Docfix. * mc/typofix: doc: fixing two trivial typos in Documentation/
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions