merge-recursive: add ability to turn off directory rename detection