tree f12359319e8af782f8c2f31ca811643ec38213f0
parent e5b06629de847663aaf0f7daae8de81338da3901
author Junio C Hamano <gitster@pobox.com> 1329694615 -0800
committer Junio C Hamano <gitster@pobox.com> 1329694615 -0800

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>