I know I said the patches looked okay earlier, but I just noticed something...
On Thu, May 10, 2018 at 2:19 PM, Stefan Beller wrote:
> case 1:
> - MERGE_WARNING(path, "not fast-forward");
> - fprintf(stderr, "Found a possible merge resolution "
> -
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 +++--
1 file ch
2 matches
Mail list logo
