merge-recursive: Fix multiple file rename across D/F conflict