X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.c;h=ee853b990d8bfb15e0058fefbbd267bd58ed40fc;hb=4c58a7111d9fb4f62ca041fc73e8aec0a2f9c800;hp=b97026bd5cc1d2ef1b46a9ef3dcd7562ad52c377;hpb=f39adc250c3e554c437d027bbc06309a78fd026d;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index b97026bd5..ee853b990 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -237,7 +237,7 @@ static int save_files_dirs(const unsigned char *sha1,
 		string_list_insert(newpath, &o->current_file_set);
 	free(newpath);
 
-	return READ_TREE_RECURSIVE;
+	return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
 }
 
 static int get_files_dirs(struct merge_options *o, struct tree *tree)