summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-11 11:19:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-11 11:19:27 -0700
commit8daff716ad6caee55e04e5550137cd3bd83b9822 (patch)
treec265e6d3c6a05ce2f72b6058958f4fac14d79731 /Documentation
parentMerge branch 'ct/advise-push-default' into maint (diff)
parentxdiff: PATIENCE/HISTOGRAM are not independent option bits (diff)
downloadtgif-8daff716ad6caee55e04e5550137cd3bd83b9822.tar.xz
Merge branch 'jc/diff-algo-cleanup' into maint
* jc/diff-algo-cleanup: xdiff: PATIENCE/HISTOGRAM are not independent option bits xdiff: remove XDL_PATCH_* macros
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions