apply: allow rerere() to work on --3way results
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 May 2012 20:56:49 +0000 (13:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jul 2012 21:40:03 +0000 (14:40 -0700)
commitf2633eb...766b7f5817ae0ec69060170bb9b1501f
treec3139ae...f3df05f44d0b1039c5e66e35f25ddf27copy hash to clipboard (tree)
parent4f4a6cb...882516d75f345772c9bf00b891753f10copy hash to clipboard (diff)
builtin/apply.c
t/t4108-apply-threeway.sh