summaryrefslogtreecommitdiff
path: root/diff-merges.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-02-23 16:58:04 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-23 16:58:04 -0800
commit66633f25c620bc622663a484c34e817b6cd97764 (patch)
tree4a99d31ced8e3bfe05ac875c8ef015c052b63bf4 /diff-merges.c
parentMerge branch 'ds/mailmap' (diff)
parentdoc: clarify interaction between 'eol' and text=auto (diff)
downloadtgif-66633f25c620bc622663a484c34e817b6cd97764.tar.xz
Merge branch 'bc/clarify-eol-attr'
Documentation update * bc/clarify-eol-attr: doc: clarify interaction between 'eol' and text=auto
Diffstat (limited to 'diff-merges.c')
0 files changed, 0 insertions, 0 deletions