Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
xdiff: PATIENCE/HISTOGRAM are not independent option bits
[gitweb.git]
/
xdiff
/
xpatience.c
diff --git
a/xdiff/xpatience.c
b/xdiff/xpatience.c
index fdd7d0263f576a8dc1a8e791ef50f8dbe25c7ee5..04e1a1ab2a863814df3b9a91d4e854704d47f3f5 100644
(file)
--- a/
xdiff/xpatience.c
+++ b/
xdiff/xpatience.c
@@
-288,7
+288,7
@@
static int fall_back_to_classic_diff(struct hashmap *map,
int line1, int count1, int line2, int count2)
{
xpparam_t xpp;
- xpp.flags = map->xpp->flags & ~XDF_
PATIENCE_DIFF
;
+ xpp.flags = map->xpp->flags & ~XDF_
DIFF_ALGORITHM_MASK
;
return xdl_fall_back_diff(map->env, &xpp,
line1, count1, line2, count2);