http://bugs.winehq.org/show_bug.cgi?id=10548
--- Comment #5 from unggnu unggnu@googlemail.com 2007-11-24 15:33:41 --- How can I revert? git-revert abcbcc35da3b6800494bd908aa7294294c90708c always gives me an error: fatal: Entry 'dlls/winex11.drv/window.c' would be overwritten by merge. Cannot merge. Automatic revert failed. After resolving the conflicts, mark the corrected paths with 'git-add <paths>' and commit the result.