aboutsummaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-20 23:48:11 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-20 23:48:11 -0800
commit7a4383cf13819cd2ef00f0d60318aad3f1813117 (patch)
tree7909507115206e773783940871aeb380df778d07 /ll-merge.h
parent8102453318caf731ec0fdfa8d9f744a0ac9a44ef (diff)
parentb1b952043f8f909649fdf053c371109c84f9cf56 (diff)
downloadgit-7a4383cf13819cd2ef00f0d60318aad3f1813117.tar.gz
git-7a4383cf13819cd2ef00f0d60318aad3f1813117.tar.xz
Merge branch 'rj/cygwin-msvc'
* rj/cygwin-msvc: MSVC: Add support for building with NO_MMAP Makefile: keep MSVC and Cygwin configuration separate
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions