merge-ort: loosen commented requirements
The comment above type_short_descriptions claimed that the order had to match what was found in the conflict_info_and_types enum. Since type_short_descriptions uses designated initializers, the order should not actually matter; I am guessing that positional initializers may have been under consideration when that comment was added, but the comment was not updated when designated initializers were chosen. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Jun 19, 2024 at 03:00 UTC
c55c3f20b1eec1bb4b23f51488cc5f3ac224bc64
1 file changed
+1
-1
merge-ort.c
+1
-1
@@ -553,7 +553,7 @@ enum conflict_and_info_types {
553
* Short description of conflict type, relied upon by external tools.
554
*
555
* We can add more entries, but DO NOT change any of these strings. Also,
556
- * Order MUST match conflict_info_and_types.
556
+ * please ensure the order matches what is used in conflict_info_and_types.
557
*/
558
static const char *type_short_descriptions[] = {
559
/*** "Simple" conflicts and informational messages ***/