Hi Junio, That indeed makes the trick. Thanks! Should I send a separate patch series with this patch ? How would that work ? "Signed-off by" me and "Based-on-patch-by" you ? Philippe. > Le 27 oct. 2019 à 22:26, Junio C Hamano <gitster@xxxxxxxxx> a écrit : > > I am not sure if the compiler needs fixing in this case, but the > following may work it around. > > builtin/merge.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/builtin/merge.c b/builtin/merge.c > index e2ccbc44e2..0746f11df2 100644 > --- a/builtin/merge.c > +++ b/builtin/merge.c > @@ -826,9 +826,12 @@ static void prepare_to_commit(struct commit_list *remoteheads) > strbuf_commented_addf(&msg, "\n"); > } > strbuf_commented_addf(&msg, _(merge_editor_comment)); > - strbuf_commented_addf(&msg, _(cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS ? > - scissors_editor_comment : > - no_scissors_editor_comment), comment_line_char); > + > + if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS) > + strbuf_commented_addf(&msg, _(scissors_editor_comment)); > + else > + strbuf_commented_addf(&msg, _(no_scissors_editor_comment), > + comment_line_char); > } > if (signoff) > append_signoff(&msg, ignore_non_trailer(msg.buf, msg.len), 0);
