https://bugs.winehq.org/show_bug.cgi?id=31994
winetest@luukku.com changed:
What |Removed |Added ---------------------------------------------------------------------------- CC| |winetest@luukku.com
--- Comment #49 from winetest@luukku.com --- At least the pach still merges cleanly just some offset changes.
patching file dlls/ws2_32/socket.c Hunk #1 succeeded at 2431 (offset 212 lines). Hunk #2 succeeded at 2446 (offset 212 lines). Hunk #3 succeeded at 2514 (offset 212 lines). patching file dlls/ws2_32/tests/sock.c Hunk #1 succeeded at 5133 (offset 356 lines). Hunk #2 succeeded at 5251 (offset 356 lines).
against wine 1.9.23-git.
The bug should contain patch keyword.