summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-09-08 13:30:30 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-08 13:30:30 -0700
commita20a40e3b62ab1c398ebfbaf2d42d90a80f1f592 (patch)
tree317b7d777096e4a31a61622f47ab42d047379d1d /xdiff-interface.c
parentMerge branch 'js/maintenance-launchctl-fix' (diff)
parentt5323: drop mentions of "master" (diff)
downloadtgif-a20a40e3b62ab1c398ebfbaf2d42d90a80f1f592.tar.xz
Merge branch 'jk/t5323-no-pack-test-fix'
Test fix. * jk/t5323-no-pack-test-fix: t5323: drop mentions of "master"
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions