diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-08 09:54:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-09 14:39:21 -0700 |
| commit | 519d1a5b4e044459bd7323cfa6a7cb98cec5c884 (patch) | |
| tree | fb5639fd9ea9cf083b852710ddede20dfea3a2d1 /builtin/commit.c | |
| parent | cfb6f9acc392561bb339763564e21b684e50ce83 (diff) | |
| download | git-519d1a5b4e044459bd7323cfa6a7cb98cec5c884.tar.gz | |
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>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions