merge-ort: provide a merge_get_conflicted_files() helper function