Next possibility for svn conflict in log parsing.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33021 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index e06adb23e899db9118a5ae3336402122f3160759..623c4b7bbdf4f5f84f343e3e290ec84dd9503c61 100644 (file)
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -631,7 +631,8 @@ string SVN::scanLogFile(FileName const & f, string & status)
                LYXERR(Debug::LYXVC, line << "\n");
                if (!line.empty()) 
                        status += line + "; ";
-               if (prefixIs(line, "C ") || contains(line, "Commit failed")) {
+               if (prefixIs(line, "C ") || prefixIs(line, "CU ")
+                                        || contains(line, "Commit failed")) {
                        ifs.close();
                        return line;
                }