Revision 06c8a37e5816f2431b469b37961588f494fefcd4 authored by Brad King on 13 September 2017, 19:09:36 UTC, committed by Brad King on 13 September 2017, 19:09:36 UTC
Use the "ours" merge strategy because we already have equivalent changes on our side.
CTestConfig.cmake
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
set(CTEST_PROJECT_NAME "CMake")
set(CTEST_NIGHTLY_START_TIME "1:00:00 UTC")
set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "open.cdash.org")
set(CTEST_DROP_LOCATION "/submit.php?project=CMake")
set(CTEST_DROP_SITE_CDASH TRUE)
set(CTEST_CDASH_VERSION "1.6")
set(CTEST_CDASH_QUERY_VERSION TRUE)
Computing file changes ...
