summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2019-08-18 20:04:12 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-19 15:04:58 -0700
commit976ff7e49d722d1b72effb6d547ec2b00cd69fc0 (patch)
tree5b6bfc6c667f0028bf1a3026a5ee9e322ad3f766 /merge-recursive.c
parentbundle: switch to use the_hash_algo (diff)
downloadtgif-976ff7e49d722d1b72effb6d547ec2b00cd69fc0.tar.xz
combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions