apply, fmt-merge-msg: use relative filenames