diff --git a/codex-rs/git-utils/src/merge_driver_tests.rs b/codex-rs/git-utils/src/merge_driver_tests.rs
index 32b84cd69b..8ceee59389 100644
--- a/codex-rs/git-utils/src/merge_driver_tests.rs
+++ b/codex-rs/git-utils/src/merge_driver_tests.rs
@@ -2303,5 +2303,6 @@ fn init_repo() -> tempfile::TempDir {
     let _ = run(root, &["git", "init"]);
     let _ = run(root, &["git", "config", "user.email", "codex@example.com"]);
     let _ = run(root, &["git", "config", "user.name", "Codex"]);
+    let _ = run(root, &["git", "config", "core.autocrlf", "false"]);
     repo
 }