merge-file: run setup_git_directory_gently() sooner