summaryrefslogtreecommitdiff
path: root/diff-merges.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-02-25 16:43:30 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-02-25 16:43:30 -0800
commit2638e33c825eb56260ad53be6b45bf31c1897ce9 (patch)
treed45e541023aa571ccca2d33ea6cd9892a90c7709 /diff-merges.h
parentMerge branch 'jc/diffcore-rotate' (diff)
parentgitmailmap.txt: fix rendering of e-mail addresses (diff)
downloadtgif-2638e33c825eb56260ad53be6b45bf31c1897ce9.tar.xz
Merge branch 'ma/doc-markup-fix'
Docfix. * ma/doc-markup-fix: gitmailmap.txt: fix rendering of e-mail addresses git.txt: fix monospace rendering rev-list-options.txt: fix rendering of bonus paragraph
Diffstat (limited to 'diff-merges.h')
0 files changed, 0 insertions, 0 deletions