Re: [PATCH 2/3] merge-recursive: i18n submodule merge output and respect verbosity

2018-05-15 Thread Junio C Hamano
Stefan Beller 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

[PATCH 2/3] merge-recursive: i18n submodule merge output and respect verbosity

2018-05-15 Thread Stefan Beller
The submodule merge code now uses the output() function that is used by all the rest of the merge-recursive-code. This allows for respecting internationalisation as well as the verbosity setting. Signed-off-by: Stefan Beller --- merge-recursive.c | 33