diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-05 09:44:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-05 09:44:43 -0800 |
| commit | 661f3797916d2bc3bd967a9dc9e6e464d5343758 (patch) | |
| tree | 508586b650ddbda72cfec2ad9432d0d0056296a7 /refs/files-backend.c | |
| parent | Merge branch 'jc/doc-compat-util' (diff) | |
| parent | merge-ort: turn submodule conflict suggestions into an advice (diff) | |
| download | git-661f3797916d2bc3bd967a9dc9e6e464d5343758.tar.gz git-661f3797916d2bc3bd967a9dc9e6e464d5343758.zip | |
Merge branch 'pb/ort-make-submodule-conflict-message-an-advice'
When a merge conflicted at a submodule, merge-ort backend used to
unconditionally give a lengthy message to suggest how to resolve
it. Now the message can be squelched as an advice message.
* pb/ort-make-submodule-conflict-message-an-advice:
merge-ort: turn submodule conflict suggestions into an advice
Diffstat (limited to 'refs/files-backend.c')
0 files changed, 0 insertions, 0 deletions