| commit | 519d1a5b4e044459bd7323cfa6a7cb98cec5c884 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 8 Jun 2012 16:54:10 +0000 (8 09:54 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Jul 2012 21:39:21 +0000 (9 14:39 -0700) | ||
| tree | fb5639fd9ea9cf083b852710ddede20dfea3a2d1 | treesnapshot (tar.gz zip) |
| parent | cfb6f9acc392561bb339763564e21b684e50ce83 | commitdiff |
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>
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 | diffblobblamehistory |