diff options
| author |  Stefan Beller <sbeller@google.com> | 2018-05-15 13:00:29 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-16 10:08:43 +0900 |
| commit | 325f3a8e077c1992a3cc6ff957811e3154edc554 (patch) | |
| tree | cc17ee83ec7b679246e39b896840a3ec1659d799 /unpack-trees.h | |
| parent | submodule.c: move submodule merging to merge-recursive.c (diff) | |
| download | tgif-325f3a8e077c1992a3cc6ff957811e3154edc554.tar.xz | |
merge-recursive: i18n submodule merge output and respect verbosity
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 <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.h')
0 files changed, 0 insertions, 0 deletions