Commit 1af628f4bfa50c224b392a774e72a213c97f6009

Stefan Sperling 2021-06-03T12:38:42

switch merge_file_cb() to using merge_file() instead of merge_blob()