diff options
| author | Elijah Newren <newren@gmail.com> | 2024-06-19 03:00:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-20 10:35:25 -0700 |
| commit | c55c3f20b1eec1bb4b23f51488cc5f3ac224bc64 (patch) | |
| tree | 84b9d6ef47b58830e99ae52d2e1d16c07b51b081 /merge-ort.c | |
| parent | 5fadf1f93371204b82a02a30315f655a293aa7f5 (diff) | |
| download | git-c55c3f20b1eec1bb4b23f51488cc5f3ac224bc64.tar.gz | |
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>
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-ort.c b/merge-ort.c index d187c966c6..d0b1346328 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -553,7 +553,7 @@ enum conflict_and_info_types { * Short description of conflict type, relied upon by external tools. * * We can add more entries, but DO NOT change any of these strings. Also, - * Order MUST match conflict_info_and_types. + * please ensure the order matches what is used in conflict_info_and_types. */ static const char *type_short_descriptions[] = { /*** "Simple" conflicts and informational messages ***/ |