summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-07-09 15:25:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-07-09 15:25:35 -0700
commit069874c8e7896f94c6ebd05e437775e45c32caf2 (patch)
tree14685ebb3c7c7602eff7f3a4b7bf7dd161e628c7 /builtin/merge.c
parentMerge branch 'dl/config-alias-doc' (diff)
parentconfigure: Detect linking style for HP aCC on HP-UX (diff)
downloadtgif-069874c8e7896f94c6ebd05e437775e45c32caf2.tar.xz
Merge branch 'mo/hpux-dynpath'
Auto-detect how to tell HP-UX aCC where to use dynamically linked libraries from at runtime. * mo/hpux-dynpath: configure: Detect linking style for HP aCC on HP-UX
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions