diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-01 13:21:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-01 13:21:34 -0700 |
| commit | ac16f55697211ae4ef557706a098b8ed34a7fda6 (patch) | |
| tree | 94753b53005ff0eeb20587b120a595a8746511db /diff-lib.c | |
| parent | Merge branch 'ds/config-internal-whitespace-fix' (diff) | |
| parent | builtin/am: allow disabling conflict advice (diff) | |
| download | git-ac16f55697211ae4ef557706a098b8ed34a7fda6.tar.gz git-ac16f55697211ae4ef557706a098b8ed34a7fda6.zip | |
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
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions