diff options
| -rw-r--r-- | Source/CTest/cmCTestUpdateHandler.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx index 81d1438..ae23f8f57 100644 --- a/Source/CTest/cmCTestUpdateHandler.cxx +++ b/Source/CTest/cmCTestUpdateHandler.cxx @@ -586,6 +586,10 @@ int cmCTestUpdateHandler::ProcessHandler() std::string upFile = file_update_line.match(2); char mod = upChar[0]; bool modifiedOrConflict = false; + if ( mod == 'X') + { + continue; + } if ( mod != 'M' && mod != 'C' && mod != 'G' ) { count ++; |