| commit | 3f9083cde3b434155c274168f166ffce2bb243e7 | |
| author | Christian Couder <chriscool@tuxfamily.org> | |
| Wed, 31 Mar 2010 19:22:06 +0000 (31 21:22 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 1 Apr 2010 18:14:10 +0000 (1 11:14 -0700) | ||
| tree | 9b491020ae10227723d7ae47860686dec0331376 | treesnapshot (tar.gz zip) |
| parent | ae8c79fd8fe47bfebf56ae83461cbedb934cff92 | commitdiff |
merge: refactor code that calls "git merge-STRATEGY"
In the try_merge_strategy() function, when the strategy is "recursive"
or "subtree", the merge_recursive() function is called.
Otherwise we launch a "git merge-STRATEGY" process.
To make it possible to reuse code that launches a "git merge-STRATEGY"
process, this patch refactors this code into a new try_merge_command()
function.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
In the try_merge_strategy() function, when the strategy is "recursive"
or "subtree", the merge_recursive() function is called.
Otherwise we launch a "git merge-STRATEGY" process.
To make it possible to reuse code that launches a "git merge-STRATEGY"
process, this patch refactors this code into a new try_merge_command()
function.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |