]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 18cfc08) | patch
merge-recursive: i18n submodule merge output and respect verbosity
authorStefan Beller <sbeller@google.com>
Tue, 15 May 2018 20:00:29 +0000 (13:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 May 2018 01:08:43 +0000 (10:08 +0900)
commit325f3a8e077c1992a3cc6ff957811e3154edc554
treecc17ee83ec7b679246e39b896840a3ec1659d799tree | snapshot
parent18cfc0886617e28fb6d29d579bec0ffcdb439196commit | diff
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>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.