* [PATCH] git-merge-recursive: honor merge.conflictstyle once again
@ 2008-10-19 0:40 Matt McCutchen
2008-10-19 21:50 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Matt McCutchen @ 2008-10-19 0:40 UTC (permalink / raw)
To: git
This was originally implemented in c236bcd06138bcbc929b86ad1a513635bf4847b2
but was lost to a mismerge in 9ba929ed652f5ed7707f1c684999af4ad02c4925.
Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>
---
merge-recursive.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 245232a..7472d3e 100644
--- 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)
--
1.6.0.2.545.g6cb4a
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] git-merge-recursive: honor merge.conflictstyle once again
2008-10-19 0:40 [PATCH] git-merge-recursive: honor merge.conflictstyle once again Matt McCutchen
@ 2008-10-19 21:50 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2008-10-19 21:50 UTC (permalink / raw)
To: Matt McCutchen; +Cc: git
Matt McCutchen <matt@mattmccutchen.net> writes:
> This was originally implemented in c236bcd06138bcbc929b86ad1a513635bf4847b2
> but was lost to a mismerge in 9ba929ed652f5ed7707f1c684999af4ad02c4925.
Good eyes; thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-10-19 21:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-19 0:40 [PATCH] git-merge-recursive: honor merge.conflictstyle once again Matt McCutchen
2008-10-19 21:50 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).