summaryrefslogtreecommitdiff
path: root/mergetools/araxis
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-03-21 09:19:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-03-21 09:19:27 -0700
commit2ab5c88642e96b6cba17079d008531f5647d33cf (patch)
tree887e1953a76de93207eaa6046de9f4de578cd092 /mergetools/araxis
parentGit 2.7.4 (diff)
parentgit-compat-util: st_add4: work around gcc 4.2.x compiler crash (diff)
downloadtgif-2ab5c88642e96b6cba17079d008531f5647d33cf.tar.xz
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 'mergetools/araxis')
0 files changed, 0 insertions, 0 deletions