summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-03 08:43:40 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-03 08:43:40 -0700
commit67ff3d27f6f0ce8f095d807f6653d606d918e545 (patch)
tree91a9b17b843993aee967238528fd4f8e4990c7a7 /xdiff-interface.h
parentMerge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1 (diff)
parentt2003: work around path mangling issue on Windows (diff)
downloadtgif-67ff3d27f6f0ce8f095d807f6653d606d918e545.tar.xz
Merge branch 'jk/checkout-attribute-lookup' into maint-1.8.1
* jk/checkout-attribute-lookup: t2003: work around path mangling issue on Windows entry: fix filter lookup t2003: modernize style
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions