summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-02-27 11:57:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-02-27 11:57:19 -0800
commitcb99be7c7d2afc71106ffaf400c769c8e72f1bb2 (patch)
tree66a78ff99d45bf4c9c1dba5867c48c08b0b44df5 /.gitattributes
parentMerge branch 'cw/bisect' (diff)
parentxdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM (diff)
downloadtgif-cb99be7c7d2afc71106ffaf400c769c8e72f1bb2.tar.xz
Merge branch 'js/merge'
* js/merge: xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions