Commit 180dce26a8f1dbb0aad3e817cde76bf0e8e55517

Stefan Sperling 2019-10-06T17:09:32

convert handling in diff3.c's merge() function to struct got_error