From 3020a554ba4bff0477aa9422de7009ae5e9035e0 Mon Sep 17 00:00:00 2001
From: Andy Cedilnik <andy.cedilnik@kitware.com>
Date: Fri, 31 Oct 2003 09:31:05 -0500
Subject: ENH: Report when having conflicts

---
 Source/cmCTest.cxx | 4 ++++
 1 file changed, 4 insertions(+)

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 )
-- 
cgit v0.12