diff --git a/builtin/merge.c b/builtin/merge.c
index 581f494aee01f97bb87a94dbfd1fba4d14afaa69..b22a8422381e73fa410d0c27a70bb9ef6cdc9232 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -759,7 +759,7 @@ int checkout_fast_forward(const unsigned char *head, const unsigned char *remote
memset(&t, 0, sizeof(t));
memset(&dir, 0, sizeof(dir));
dir.flags |= DIR_SHOW_IGNORED;
memset(&t, 0, sizeof(t));
memset(&dir, 0, sizeof(dir));
dir.flags |= DIR_SHOW_IGNORED;
- dir.exclude_per_dir = ".gitignore";
+ setup_standard_excludes(&dir);
opts.dir = &dir;
opts.head_idx = 1;
opts.dir = &dir;
opts.head_idx = 1;