Re: [PATCH 22/48] merge-recursive: Fix sorting order and directory change assumptions

>> +static int string_list_df_name_compare(const void *a, const void *b)
>> +{
>> +     const struct string_list_item *one = a;
>> +     const struct string_list_item *two = b;
>> +     /*
>> +      * Here we only care that entries for D/F conflicts are
>> +      * adjacent, in particular with the file of the D/F conflict
>> +      * appearing before files below the corresponding directory.
>> +      * The order of the rest of the list is irrelevant for us.
>> +      *
>> +      * To achieve this, we sort with df_name_compare and provide
>> +      * the mode S_IFDIR so that D/F conflicts will sort correctly.
>> +      * We use the mode S_IFDIR for everything else for simplicity,
>> +      * since in other cases any changes in their order due to
>> +      * sorting cause no problems for us.
>> +      */
>
> I recall there was an issue of this sorting reported earlier...