diff options
| author | Elijah Newren <newren@gmail.com> | 2024-06-19 05:00:17 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-20 19:35:25 +0200 |
| commit | c55c3f20b1eec1bb4b23f51488cc5f3ac224bc64 (patch) | |
| tree | 84b9d6ef47b58830e99ae52d2e1d16c07b51b081 /notes.h | |
| parent | merge-ort: clearer propagation of failure-to-function from merge_submodule (diff) | |
| download | git-c55c3f20b1eec1bb4b23f51488cc5f3ac224bc64.tar.xz git-c55c3f20b1eec1bb4b23f51488cc5f3ac224bc64.zip | |
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 'notes.h')
0 files changed, 0 insertions, 0 deletions