]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/merge.c
builtin/merge: convert to struct object_id
authorbrian m. carlson <sandals@crustytoothpaste.net>
Tue, 21 Feb 2017 23:47:28 +0000 (23:47 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Feb 2017 18:12:15 +0000 (10:12 -0800)
commit52684310baadac2de07548af67993309d00ce0cf
tree46db3b46bf24d9797fae96b97f600d1d5ca8f321
parentddc2cc64e19e2aee35bdb60d960684356555fad6
builtin/merge: convert to struct object_id

Additionally convert several uses of the constant 40 into
GIT_SHA1_HEXSZ.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge.c