From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Mon, 16 Jul 2018 01:28:03 +0000 (+0000)
Subject: builtin/merge: switch to use the_hash_algo
X-Git-Tag: v2.19.0-rc0~112^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ab47df2d9a1d07380a02c9be2c57bca1cfbb054e?ds=inline;hp=ab47df2d9a1d07380a02c9be2c57bca1cfbb054e

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>
---