Thomas Rast 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 the other da
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
---
merge-recursive.c | 38 +
2 matches
Mail list logo
