merge: refactor code that calls "git merge-STRATEGY"
authorChristian Couder <chriscool@tuxfamily.org>
Wed, 31 Mar 2010 19:22:06 +0000 (21:22 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Apr 2010 18:14:10 +0000 (11:14 -0700)
commit3f9083cde3b434155c274168f166ffce2bb243e7
tree9b491020ae10227723d7ae47860686dec0331376
parentae8c79fd8fe47bfebf56ae83461cbedb934cff92
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>
builtin/merge.c