Junio C Hamano ac16f55697 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

2024-04-01 13:21:34 -07:00

182 KiB

Raw Blame History

View Raw