summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-09-29 22:17:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-29 22:17:24 -0700
commit7dded6610e813c849b8f656862626586d883c31f (patch)
tree3a8f57dd20898582771f008e63d9c60edee01f2e /builtin/merge-tree.c
parentMerge branch 'jc/test-lazy-prereq' (diff)
parentautoconf: check for setitimer() (diff)
downloadtgif-7dded6610e813c849b8f656862626586d883c31f.tar.xz
Merge branch 'jt/itimer-autoconf'
setitmer(2) and related API elements can be configured from Makefile but autoconf did not know about it. * jt/itimer-autoconf: autoconf: check for setitimer() autoconf: check for struct itimerval git-compat-util.h: add missing semicolon after struct itimerval
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions