summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-19 15:36:55 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-19 15:36:55 -0800
commit307ab20b333d9b4c818b1ff912e86944d1a3fdc1 (patch)
treef12359319e8af782f8c2f31ca811643ec38213f0 /Documentation/git.txt
parentxdiff: remove XDL_PATCH_* macros (diff)
downloadtgif-307ab20b333d9b4c818b1ff912e86944d1a3fdc1.tar.xz
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>
Diffstat (limited to 'Documentation/git.txt')
0 files changed, 0 insertions, 0 deletions