projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
contrib/difftool: use a separate config namespace for difftool commands
[git.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index b97026bd5cc1d2ef1b46a9ef3dcd7562ad52c377..ee853b990d8bfb15e0058fefbbd267bd58ed40fc 100644
(file)
--- 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)