Commit 960094b4eff0069984143900870f8486dbe0a08d

Stefan Sperling 2020-07-23T14:22:34

resolve an XXX remark in merge_file_cb()