[PATCH 2/3] merge-recursive: untangle double meaning of o-call_depth

o-call_depth has a double function: a nonzero call_depth means we want to construct virtual merge bases, but it also means we want to avoid touching the worktree. Introduce a new flag o-no_worktree for the latter. Signed-off-by: Thomas Rast tr...@inf.ethz.ch --- merge-recursive.c | 38

Re: [PATCH 2/3] merge-recursive: untangle double meaning of o-call_depth

Thomas Rast tr...@inf.ethz.ch writes: o-call_depth has a double function: a nonzero call_depth means we want to construct virtual merge bases, but it also means we want to avoid touching the worktree. Introduce a new flag o-no_worktree for the latter. I do remember discussing this with you