summaryrefslogtreecommitdiff
path: root/pkt-line.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-11 18:19:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-05-11 18:19:27 (GMT)
commit8daff716ad6caee55e04e5550137cd3bd83b9822 (patch)
treec265e6d3c6a05ce2f72b6058958f4fac14d79731 /pkt-line.h
parent07e74b0da2896ffa6acb5c33f56d7266b35b7ac9 (diff)
parent307ab20b333d9b4c818b1ff912e86944d1a3fdc1 (diff)
downloadgit-8daff716ad6caee55e04e5550137cd3bd83b9822.zip
git-8daff716ad6caee55e04e5550137cd3bd83b9822.tar.gz
git-8daff716ad6caee55e04e5550137cd3bd83b9822.tar.bz2
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 'pkt-line.h')
0 files changed, 0 insertions, 0 deletions