summaryrefslogtreecommitdiff
path: root/src/merge.c
diff options
context:
space:
mode:
authorLeo Yang <lyang@topologyinc.com>2015-10-30 13:53:53 -0400
committerLeo Yang <lyang@topologyinc.com>2015-11-02 16:19:25 -0500
commit505e4531b7e52daf6caa9eac9904d9a014e0d14f (patch)
treedd6f69a9c22a59cea986815e936987f80db5df3d /src/merge.c
parente0be1d605f6a219b07bc3eaa8541318074c986b6 (diff)
downloadlibgit2-505e4531b7e52daf6caa9eac9904d9a014e0d14f.tar.gz
Fix build for unit test
If none of GIT_OPENSSL, GIT_WINHTTP or GIT_SECURE_TRANSPORT is defined we should also be able to build the unit test.
Diffstat (limited to 'src/merge.c')
0 files changed, 0 insertions, 0 deletions