Re: [PATCH 2/6] Avoid checking working copy when creating a virtual merge base

Elijah Newren writes: > There were a few cases in merge-recursive that could result in a check for > the presence of files in the working copy while trying to create a virtual > merge base. These were rare and innocuous, but somewhat illogical. The > two cases were: > > * When there was namin

[PATCH 2/6] Avoid checking working copy when creating a virtual merge base

There were a few cases in merge-recursive that could result in a check for the presence of files in the working copy while trying to create a virtual merge base. These were rare and innocuous, but somewhat illogical. The two cases were: * When there was naming conflicts (e.g. a D/F conflict) a