projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
971e835
)
git-merge-recursive: honor merge.conflictstyle once again
author
Matt McCutchen
<matt@mattmccutchen.net>
Sun, 19 Oct 2008 00:40:50 +0000
(20:40 -0400)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 19 Oct 2008 21:49:38 +0000
(14:49 -0700)
This was originally implemented in
c236bcd06138bcbc929b86ad1a513635bf4847b2
but was lost to a mismerge in
9ba929ed652f5ed7707f1c684999af4ad02c4925
.
Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c
patch
|
blob
|
history
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)