Files
git/Documentation
Junio C Hamano 661f379791 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
2024-03-05 09:44:43 -08:00
..
2024-03-01 14:38:56 -08:00
2023-10-30 07:09:55 +09:00
2024-02-27 16:04:31 -08:00
2023-11-26 10:07:05 +09:00
2023-06-12 13:52:51 -07:00
2023-10-09 12:06:24 -07:00
2023-10-09 12:06:29 -07:00
2023-11-26 10:07:05 +09:00
2023-12-26 11:06:55 -08:00
2024-02-21 10:02:55 -08:00
2023-10-09 12:06:29 -07:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2024-01-02 13:51:30 -08:00
2023-10-09 12:06:24 -07:00
2023-10-09 12:06:29 -07:00
2023-12-14 14:38:07 -08:00
2023-12-26 11:06:55 -08:00
2023-08-28 09:16:06 -07:00
2023-11-26 10:07:05 +09:00
2023-12-26 11:06:55 -08:00