MergeDoc.cpp: Fix mixed eol-style

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index aae3b12..478b526 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -749,7 +749,7 @@ void CMergeDoc::ShowRescanError(int nRescanResult, IDENTLEVEL identical)
 
                        if (theApp.m_bExitIfNoDiff != MergeCmdLineInfo::ExitQuiet)
                        {
-                               GetMainFrame()->SendMessageToDescendants(WM_IDLEUPDATECMDUI, (WPARAM)TRUE, 0, TRUE, TRUE);\r
+                               GetMainFrame()->SendMessageToDescendants(WM_IDLEUPDATECMDUI, (WPARAM)TRUE, 0, TRUE, TRUE);
                                LangMessageBox(IDS_FILESSAME, nFlags);
                        }