merge-recursive: Avoid working directory changes during recursive case