summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: 307ab20)
raw | patch | inline | side by side (from: 307ab20)
author | Junio C Hamano <gitster@pobox.com> | |
Sun, 19 Feb 2012 23:36:55 +0000 (15:36 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 19 Feb 2012 23:36:55 +0000 (15:36 -0800) |
Because the default Myers, patience and histogram algorithms cannot be in
effect at the same time, XDL_PATIENCE_DIFF and XDL_HISTOGRAM_DIFF are not
independent bits. Instead of wasting one bit per algorithm, define a few
macros to access the few bits they occupy and update the code that access
them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
effect at the same time, XDL_PATIENCE_DIFF and XDL_HISTOGRAM_DIFF are not
independent bits. Instead of wasting one bit per algorithm, define a few
macros to access the few bits they occupy and update the code that access
them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found