[PATCH] nptl: Split libpthread-routines into one routine per line

[Florian Weimer]

* Andreas Schwab:

> On Dez 14 2020, Florian Weimer wrote:
>
>> * Andreas Schwab:
>>
>>> On Dez 14 2020, Florian Weimer via Libc-alpha wrote:
>>>
>>>> This will make it easier to review patches which move symbols from
>>>> libpthread to libc.
>>>
>>> Try diff-minor-mode.
>>
>> Is this about showing added and removed text within hunks?
>>
>> This does not address the issue of conflicts at the end of the list.
>
> It also helps with conflict resolution.

It's still manual conflict resolution.  In my experience, alphabetic
sorting enables more automatic conflict resolution (even without a
custom merge driver).

Thanks,
Florian
-- 
Red Hat GmbH, https://de.redhat.com/ , Registered seat: Grasbrunn,
Commercial register: Amtsgericht Muenchen, HRB 153243,
Managing Directors: Charles Cachera, Brian Klemm, Laurie Krebs, Michael O'Neill