kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jk/diff-algo' 

* jk/diff-algo:
  merge-recursive: fix parsing of "diff-algorithm" option
maint
Jonathan Nieder 2013-10-14 10:59:51 -07:00
parent c5f424fd01 6562928ae9
commit 92d2afd563
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
merge-recursive.c
View File

@ -2069,8 +2069,8 @@ int parse_merge_opt(struct merge_options *o, const char *s)
o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF); o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
else if (!strcmp(s, "histogram")) else if (!strcmp(s, "histogram"))
o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF); o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
else if (!strcmp(s, "diff-algorithm=")) { else if (!prefixcmp(s, "diff-algorithm=")) {
long value = parse_algorithm_value(s+15); long value = parse_algorithm_value(s + strlen("diff-algorithm="));
if (value < 0) if (value < 0)
return -1; return -1;
/* clear out previous settings */ /* clear out previous settings */