Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Stop using compat/regex.c on platforms with working regexp library
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 245232a4083bbd8cdadf3b32a0a20db559941f8a..7472d3ecc9b8412a697a64c1307259a104e0abf9 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-1332,7
+1332,7
@@
static int merge_recursive_config(const char *var, const char *value, void *cb)
o->merge_rename_limit = git_config_int(var, value);
return 0;
}
- return git_
default
_config(var, value, cb);
+ return git_
xmerge
_config(var, value, cb);
}
void init_merge_options(struct merge_options *o)