phillip.wood123@xxxxxxxxx writes: > On 08/03/2024 16:15, Junio C Hamano wrote: >> "Phillip Wood via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: >> parse_conflict_style_name() that takes a name and returns >> conflict_style enumeration constant would not risk such a confusion, >> I guess. > > Can I just check if you mean that we should convert XDL_MERGE_DIFF3 > and friends to be an enum, or are you happy to leave them as > pre-processor constants and have parse_conflict_style_name() return an > int? The latter. I was only wondering what the good name for the new function was and did not mean to imply that we want conversions from C preprocessor macros to enums.
