aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-09 14:31:27 +0900
committerJunio C Hamano <gitster@pobox.com>2017-11-09 14:31:27 +0900
commitb169d187682ed3f928df7806b00f3a62b83edfef (patch)
treef091292987bf8c7c5e1607f6b3df054081034812 /merge-recursive.c
parent4e9762ed4791a44f7b1c2ab66328b81bdc243173 (diff)
parentf21d60b4299378f4d99b9d234ae013f81661e838 (diff)
downloadgit-b169d187682ed3f928df7806b00f3a62b83edfef.tar.gz
git-b169d187682ed3f928df7806b00f3a62b83edfef.tar.xz
Merge branch 'ad/5580-unc-tests-on-cygwin'
UNC paths are also relevant in Cygwin builds and they are now tested just like Mingw builds. * ad/5580-unc-tests-on-cygwin: t5580: add Cygwin support
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions