summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-12-12 14:31:41 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-12-12 14:31:42 -0800
commit3889e7a60c65031f0c5381d8060cefb4294d932e (patch)
treef63aa1e6a391e3fede0821e003b257ddfc721a2c /t/t7610-mergetool.sh
parentMerge branch 'jk/push-simple' (diff)
parentpack-bitmap: do not use gcc packed attribute (diff)
downloadtgif-3889e7a60c65031f0c5381d8060cefb4294d932e.tar.xz
Merge branch 'jk/pack-bitmap'
* jk/pack-bitmap: pack-bitmap: do not use gcc packed attribute
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions