summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-21 16:19:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-03-21 16:19:27 (GMT)
commit2ab5c88642e96b6cba17079d008531f5647d33cf (patch)
tree887e1953a76de93207eaa6046de9f4de578cd092 /t/t7600-merge.sh
parent937978e0f3e750d917768c77665d5f8cfbd802b6 (diff)
parentd616fbf256ef3102669d450ddadd8469fefcf95c (diff)
downloadgit-2ab5c88642e96b6cba17079d008531f5647d33cf.zip
git-2ab5c88642e96b6cba17079d008531f5647d33cf.tar.gz
git-2ab5c88642e96b6cba17079d008531f5647d33cf.tar.bz2
Merge branch 'es/st-add4-gcc-4.2-workaround' into maint
* es/st-add4-gcc-4.2-workaround: git-compat-util: st_add4: work around gcc 4.2.x compiler crash
Diffstat (limited to 't/t7600-merge.sh')
0 files changed, 0 insertions, 0 deletions