Junio C Hamano 307ab20b33 xdiff: PATIENCE/HISTOGRAM are not independent option bits ...

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>

2012-02-19 15:36:55 -08:00

9.9 KiB

Raw Blame History

View Raw