]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4f4a6cb) | patch
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)
commitf2633ebd766b7f5817ae0ec69060170bb9b1501f
treec3139aeef3df05f44d0b1039c5e66e35f25ddf27tree | snapshot
parent4f4a6cb9882516d75f345772c9bf00b891753f10commit | diff
apply: allow rerere() to work on --3way results

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/apply.c diff | blob | blame | history
t/t4108-apply-threeway.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.