xdiff: PATIENCE/HISTOGRAM are not independent option bits
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 Feb 2012 23:36:55 +0000 (15:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 Feb 2012 23:36:55 +0000 (15:36 -0800)
commit307ab20b333d9b4c818b1ff912e86944d1a3fdc1
treef12359319e8af782f8c2f31ca811643ec38213f0
parente5b06629de847663aaf0f7daae8de81338da3901
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>
diff.c
diff.h
merge-recursive.c
xdiff/xdiff.h
xdiff/xdiffi.c
xdiff/xhistogram.c
xdiff/xpatience.c
xdiff/xprepare.c