| commit | f2633ebd766b7f5817ae0ec69060170bb9b1501f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 May 2012 20:56:49 +0000 (10 13:56 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Jul 2012 21:40:03 +0000 (9 14:40 -0700) | ||
| tree | c3139aeef3df05f44d0b1039c5e66e35f25ddf27 | treesnapshot (tar.gz zip) |
| parent | 4f4a6cb9882516d75f345772c9bf00b891753f10 | commitdiff |
apply: allow rerere() to work on --3way results
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/apply.c | diffblobblamehistory | |
| t/t4108-apply-threeway.sh | diffblobblamehistory |