merge_tools: use right_file_mode
in make_diff_files
#4406
This run and associated checks have been archived and are scheduled for deletion.
Learn more about checks retention