git.99rst.org Git - git.git/commit

git.99rst.org / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 4f4a6cb)

author	Junio C Hamano <redacted>
	Thu, 10 May 2012 20:56:49 +0000 (13:56 -0700)
committer	Junio C Hamano <redacted>
	Mon, 9 Jul 2012 21:40:03 +0000 (14:40 -0700)
commit	f2633ebd766b7f5817ae0ec69060170bb9b1501f
tree	c3139aeef3df05f44d0b1039c5e66e35f25ddf27	tree \| snapshot
parent	4f4a6cb9882516d75f345772c9bf00b891753f10	commit \| diff

apply: allow rerere() to work on --3way results

Signed-off-by: Junio C Hamano <redacted>

builtin/apply.c		diff \| blob \| history
t/t4108-apply-threeway.sh		diff \| blob \| history

git clone https://git.99rst.org/PROJECT