[Bug 49869] Battle for Wesnoth 1.14.14-win32 does not start (regression)

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=49869

--- Comment #10 from Cedric <cedric.dewijs at eclipso.eu> ---
Reverting the offending patch is not trivial:
$ git revert -n e561ce4b9259071f79d219dddf62f05cdd8dd07b
Auto-merging dlls/ntdll/unixlib.h
CONFLICT (content): Merge conflict in dlls/ntdll/unixlib.h
Auto-merging dlls/ntdll/unix/unix_private.h
CONFLICT (content): Merge conflict in dlls/ntdll/unix/unix_private.h
Auto-merging dlls/ntdll/unix/thread.c
CONFLICT (content): Merge conflict in dlls/ntdll/unix/thread.c
Auto-merging dlls/ntdll/unix/loader.c
CONFLICT (content): Merge conflict in dlls/ntdll/unix/loader.c
Auto-merging dlls/ntdll/signal_x86_64.c
CONFLICT (content): Merge conflict in dlls/ntdll/signal_x86_64.c
CONFLICT (modify/delete): dlls/ntdll/signal_powerpc.c deleted in HEAD and
modified in parent of e561ce4b92... ntdll: Move NtRaiseException()
implementation to the Unix library.. Version parent of e561ce4b92... ntdll:
Move NtRaiseException() implementation to the Unix library. of
dlls/ntdll/signal_powerpc.c left in tree.
Auto-merging dlls/ntdll/signal_i386.c
CONFLICT (content): Merge conflict in dlls/ntdll/signal_i386.c
Auto-merging dlls/ntdll/signal_arm64.c
CONFLICT (content): Merge conflict in dlls/ntdll/signal_arm64.c
Auto-merging dlls/ntdll/signal_arm.c
CONFLICT (content): Merge conflict in dlls/ntdll/signal_arm.c
Auto-merging dlls/ntdll/ntdll.spec
Auto-merging dlls/ntdll/exception.c
error: could not revert e561ce4b92... ntdll: Move NtRaiseException()
implementation to the Unix library.
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'

-- 
Do not reply to this email, post in Bugzilla using the
above URL to reply.
You are receiving this mail because:
You are watching all bug changes.