Merge pull request #6060 from ccstolley/ccs_merge_bugfix merge: Check file mode when resolving renames
2021-09-20T08:33:12