diff options
| author | Michael J Gruber <git@grubix.eu> | 2022-08-18 15:13:27 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-19 13:44:48 -0700 |
| commit | 1c8dfc3674fd9da7ded669b706b292ee2074db73 (patch) | |
| tree | 11f7bd9bdfd6cb5282993953c71c9a6522fb5cbc /t/t4013/diff.format-patch_--inline_--stdout_initial..master^ | |
| parent | 5670e0ec1576fd0cd68f7cb610c878c645786972 (diff) | |
| download | git-1c8dfc3674fd9da7ded669b706b292ee2074db73.tar.gz git-1c8dfc3674fd9da7ded669b706b292ee2074db73.zip | |
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>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master^')
0 files changed, 0 insertions, 0 deletions