merge-recursive: handle file mode changes