]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5670e0e) | patch
sequencer: do not translate parameters to error_resolve_conflict()
authorMichael J Gruber <git@grubix.eu>
Thu, 18 Aug 2022 13:13:27 +0000 (15:13 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Aug 2022 20:44:48 +0000 (13:44 -0700)
commit1c8dfc3674fd9da7ded669b706b292ee2074db73
tree11f7bd9bdfd6cb5282993953c71c9a6522fb5cbctree | snapshot
parent5670e0ec1576fd0cd68f7cb610c878c645786972commit | diff
sequencer: do not translate parameters to error_resolve_conflict()

`error_resolve_conflict()` checks the untranslated action_name
parameter, so pass it as is.

Suggested-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Michael J Gruber <git@grubix.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.