summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2013-10-14 17:59:51 (GMT)
committerJonathan Nieder <jrnieder@gmail.com>2013-10-14 17:59:51 (GMT)
commit92d2afd563afca4d6b4c20c7e2e859bc7219a3b1 (patch)
tree32ba979a8b05d24557b633addc467e7173322982 /merge-recursive.c
parentc5f424fd014488bd8a92b97f52bfe47823bc2128 (diff)
parent6562928ae9ea46a3f2a7bd5a3dd500a7c149cc64 (diff)
downloadgit-92d2afd563afca4d6b4c20c7e2e859bc7219a3b1.zip
git-92d2afd563afca4d6b4c20c7e2e859bc7219a3b1.tar.gz
git-92d2afd563afca4d6b4c20c7e2e859bc7219a3b1.tar.bz2
Merge branch 'jk/diff-algo'
* jk/diff-algo: merge-recursive: fix parsing of "diff-algorithm" option
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 40eb840..dbb7104 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2069,8 +2069,8 @@ int parse_merge_opt(struct merge_options *o, const char *s)
o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
else if (!strcmp(s, "histogram"))
o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
- else if (!strcmp(s, "diff-algorithm=")) {
- long value = parse_algorithm_value(s+15);
+ else if (!prefixcmp(s, "diff-algorithm=")) {
+ long value = parse_algorithm_value(s + strlen("diff-algorithm="));
if (value < 0)
return -1;
/* clear out previous settings */