summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-10-20 15:29:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-10-20 15:29:57 -0700
commit74301d6edeb0e081a4ef864057952b6a7ff2b4be (patch)
treef64ff7da9651848e38253bc2de5135dc45186578 /xdiff-interface.h
parentSixth batch for 2.7 (diff)
parentMerge branch 'js/gc-with-stale-symref' into maint (diff)
downloadtgif-74301d6edeb0e081a4ef864057952b6a7ff2b4be.tar.xz
Sync with maint
* maint:
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions