projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cfb6f9a) | patch
apply: fall back on three-way merge
authorJunio C Hamano <gitster@pobox.com>
Fri, 8 Jun 2012 16:54:10 +0000 (09:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jul 2012 21:39:21 +0000 (14:39 -0700)
commit519d1a5b4e044459bd7323cfa6a7cb98cec5c884
treefb5639fd9ea9cf083b852710ddede20dfea3a2d1tree | snapshot
parentcfb6f9acc392561bb339763564e21b684e50ce83commit | diff
apply: fall back on three-way merge

Grab the preimage blob the patch claims to be based on out of the object
store, apply the patch, and then call three-way-merge function.  This step
still does not plug the actual three-way merge logic yet, but we are
getting there.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/apply.c diff | blob | history
Git—the stupid content tracker