summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2018-07-16 01:28:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-16 21:27:39 (GMT)
commitab47df2d9a1d07380a02c9be2c57bca1cfbb054e (patch)
tree2015442f435be939608d99ac36da7efd75d1cf36 /builtin/merge-recursive.c
parent5188eb5d8e80c2f330fbafb021ffa28bac2ef88a (diff)
downloadgit-ab47df2d9a1d07380a02c9be2c57bca1cfbb054e.zip
git-ab47df2d9a1d07380a02c9be2c57bca1cfbb054e.tar.gz
git-ab47df2d9a1d07380a02c9be2c57bca1cfbb054e.tar.bz2
builtin/merge: switch to use the_hash_algo
Switch uses of GIT_SHA1_HEXSZ to use the_hash_algo instead. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions