Hi, 

Le 2024-03-02 à 11:18, Philippe Blain via GitGitGadget a écrit :

From: Philippe Blain <redacted>

Allow disabling the advice shown when a squencer operation results in a
merge conflict through a new config 'advice.sequencerConflict'.

Update the tests accordingly. Note that the body of the second test in
t3507-cherry-pick-conflict.sh is enclosed in double quotes, so we must
escape them in the added line.

Signed-off-by: Philippe Blain <redacted>

I meant to CC your addresses in https://lore.kernel.org/git/pull.1682.git.1709396291693.gitgitgadget@gmail.com/ (local)
which I'm responding to, but the CC's did not get through somehow.

Cheers,

Philippe.