On 2025-01-15 16:53, Jeremy Drake wrote:
On Wed, 15 Jan 2025, Brian Inglis wrote:
+<<<<<<< HEAD
isastream
+=======
+ kill_dependency (not available in "stdatomic.h" header)
+>>>>>>> 5888275d7f48 (Cygwin: winsup/doc/posix.xml: SUS V5 POSIX 2024 move or
remove dropped entries)
Conflict added here, removed in next patch (5/8).
Thanks - finding limits to interactive rebasing and cherry-picking - and that
they do not always work as expected, or smoothly!
--
Take care. Thanks, Brian Inglis Calgary, Alberta, Canada
La perfection est atteinte Perfection is achieved
non pas lorsqu'il n'y a plus rien à ajouter not when there is no more to add
mais lorsqu'il n'y a plus rien à retrancher but when there is no more to cut
-- Antoine de Saint-Exupéry
