merge: sort filemap only if requested by the caller

Merge request reports

Loading