Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> writes: > The try_merge_strategy() function always ran the strategy in a separate > process, though this is not always necessary. The recursive strategy can > be called without a fork(). This patch adds a check, and calls recursive > in the same process without wasting resources. Yes, it saves a fork, but is this really worth it in the bigger picture? Doesn't the current code structure have benefit of allowing git-merge itself do necessary clean-up action when merge-recursive calls any of the die() it has in many places? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
