builtin/merge: switch to use the_hash_algo
commitab47df2d9a1d07380a02c9be2c57bca1cfbb054e
authorbrian m. carlson <sandals@crustytoothpaste.net>
Mon, 16 Jul 2018 01:28:03 +0000 (16 01:28 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jul 2018 21:27:39 +0000 (16 14:27 -0700)
tree2015442f435be939608d99ac36da7efd75d1cf36
parent5188eb5d8e80c2f330fbafb021ffa28bac2ef88a
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>
builtin/merge.c