]> git.ipfire.org Git - thirdparty/git.git/commit
apply: convert threeway_stage to object_id
authorbrian m. carlson <sandals@crustytoothpaste.net>
Fri, 13 Mar 2015 23:39:36 +0000 (23:39 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 14 Mar 2015 05:43:14 +0000 (22:43 -0700)
commitd07d4ab401173a10173f2747cf5e0f074b6d2b39
tree989060aaa725d67860188240bf9f6793e6b60afd
parent1a876a69af6552d16827ecc1931c42e2287a83a0
apply: convert threeway_stage to object_id

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