Merge branch 'pb/advice-merge-conflict'

Hints that suggest what to do after resolving conflicts can now be
squelched by disabling advice.mergeConflict.

Acked-by: Phillip Wood <phillip.wood123@gmail.com>
cf. <e040c631-42d9-4501-a7b8-046f8dac6309@gmail.com>

* pb/advice-merge-conflict:
  builtin/am: allow disabling conflict advice
  sequencer: allow disabling conflict advice

diff --cc builtin/am.c
Simple merge

diff --cc sequencer.c
index 4e14fa6541c7012c8549e84957c47f386efbc7ec,019f0a0b27a997813614401099883800a8c1f0a5..f4e6284a6c8447443d186f8025767ba98dbdeefe
--- 1/sequencer.c
--- 2/sequencer.c
+++ b/sequencer.c
@@@ -471,15 -464,10 +471,15 @@@ N_("Resolve all conflicts manually, mar
  static void print_advice(struct repository *r, int show_hint,
                         struct replay_opts *opts)
  {
 -      char *msg = getenv("GIT_CHERRY_PICK_HELP");
 +      const char *msg;
 +
 +      if (is_rebase_i(opts))
 +              msg = rebase_resolvemsg;
 +      else
 +              msg = getenv("GIT_CHERRY_PICK_HELP");
  
        if (msg) {
-               advise("%s\n", msg);
+               advise_if_enabled(ADVICE_MERGE_CONFLICT, "%s", msg);
                /*
                 * A conflict has occurred but the porcelain
                 * (typically rebase --interactive) wants to take care