{"thread":{"id":"15957","subject":"[PATCH] git-merge-recursive: honor merge.conflictstyle once again","startedAt":"2008-10-19T00:40:50Z","lastAt":"2008-10-19T21:50:12Z","messageCount":2,"participants":["Matt McCutchen","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"93403","messageId":"1224376850.19061.1.camel@mattlaptop2.local","threadId":"15957","inReplyTo":null,"subject":"[PATCH] git-merge-recursive: honor merge.conflictstyle once again","fromName":"Matt McCutchen","fromEmail":"matt@mattmccutchen.net","sentAt":"2008-10-19T00:40:50Z","receivedAt":"2008-10-19T00:40:50Z","isPatch":true,"sender":{"key":"matt@mattmccutchen.net","avatar":"https://avatars.githubusercontent.com/u/8885753?v=4"},"body":"This was originally implemented in c236bcd06138bcbc929b86ad1a513635bf4847b2\nbut was lost to a mismerge in 9ba929ed652f5ed7707f1c684999af4ad02c4925.\n\nSigned-off-by: Matt McCutchen <matt@mattmccutchen.net>\n---\n merge-recursive.c |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 245232a..7472d3e 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -1332,7 +1332,7 @@ static int merge_recursive_config(const char *var, const char *value, void *cb)\n \t\to->merge_rename_limit = git_config_int(var, value);\n \t\treturn 0;\n \t}\n-\treturn git_default_config(var, value, cb);\n+\treturn git_xmerge_config(var, value, cb);\n }\n \n void init_merge_options(struct merge_options *o)\n-- \n1.6.0.2.545.g6cb4a\n"},{"id":"93449","messageId":"7vmyh05k6j.fsf@gitster.siamese.dyndns.org","threadId":"15957","inReplyTo":"1224376850.19061.1.camel@mattlaptop2.local","subject":"Re: [PATCH] git-merge-recursive: honor merge.conflictstyle once again","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-10-19T21:50:12Z","receivedAt":"2008-10-19T21:50:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matt McCutchen <matt@mattmccutchen.net> writes:\n\n> This was originally implemented in c236bcd06138bcbc929b86ad1a513635bf4847b2\n> but was lost to a mismerge in 9ba929ed652f5ed7707f1c684999af4ad02c4925.\n\nGood eyes; thanks.\n"}]}