Commit 01a44956166c76e44f58809e5a1ea1477adfef80

Stefan Sperling 2019-03-27T08:36:44

declare conflict marker strings in got_lib_diff.h