diff options
| -rw-r--r-- | Source/cmCTest.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 331fb22..64af104 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -704,6 +704,10 @@ int cmCTest::UpdateDirectory() { comment1 = "Locally modified file\n"; } + if ( mod == 'C' ) + { + comment1 = "Conflict while updating\n"; + } std::string path = cmSystemTools::GetFilenamePath(file); std::string fname = cmSystemTools::GetFilenameName(file); if ( path != current_path ) |