Stefan Beller <sbeller@xxxxxxxxxx> writes:
> +static int merge_submodule(struct merge_options *o,
> + struct object_id *result, const char *path,
> const struct object_id *base, const struct object_id *a,
> - const struct object_id *b, int search)
> + const struct object_id *b)
> {
> struct commit *commit_base, *commit_a, *commit_b;
> int parent_count;
> struct object_array merges;
>
> int i;
> + int search = !o->call_depth;
I kind of like this "while at it" change in this patch ;-)
