apply: register conflicted stages to the index
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 May 2012 23:50:58 +0000 (16:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jul 2012 21:40:03 +0000 (14:40 -0700)
commit4f4a6cb...882516d75f345772c9bf00b891753f10
treea57560f...1782f788828fac856d32cd343d36d2cecopy hash to clipboard (tree)
parent099f3c4...1a446e2eef3a1bb6aea0e451711ddd88copy hash to clipboard (diff)
builtin/apply.c
t/t4108-apply-threeway.sh [new file with mode: 0755]