summaryrefslogtreecommitdiff
path: root/Source/CTest/cmCTestUpdateHandler.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2008-10-01 12:46:45 -0400
committerBill Hoffman <bill.hoffman@kitware.com>2008-10-01 12:46:45 -0400
commit32bc02d6604f49e7d474985260d70f38b94d2de7 (patch)
tree82e026da74ff8ae0ea7cd3fb4dbaa8f74c6784cc /Source/CTest/cmCTestUpdateHandler.cxx
parent049e3da2ec4890ad3de15bd2abcc067269395f54 (diff)
downloadcmake-32bc02d6604f49e7d474985260d70f38b94d2de7.tar.gz
BUG: undo fix for 7292 because a switched file should show up as an odd thing on the dashbaord
Diffstat (limited to 'Source/CTest/cmCTestUpdateHandler.cxx')
-rw-r--r--Source/CTest/cmCTestUpdateHandler.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx
index 0e7a6a4ee5..40cc0cc445 100644
--- a/Source/CTest/cmCTestUpdateHandler.cxx
+++ b/Source/CTest/cmCTestUpdateHandler.cxx
@@ -700,7 +700,7 @@ int cmCTestUpdateHandler::ProcessHandler()
std::string upFile = file_update_line.match(2);
char mod = upChar[0];
bool modifiedOrConflict = false;
- if ( mod == 'X' || mod == 'S' || mod == 'L')
+ if ( mod == 'X' || mod == 'L')
{
continue;
}