Success build TortoiseMerge.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseMerge / BottomView.cpp

diff --git a/src/TortoiseMerge/BottomView.cpp b/src/TortoiseMerge/BottomView.cpp
index 54862dc..d692727 100644 (file)
--- a/src/TortoiseMerge/BottomView.cpp
+++ b/src/TortoiseMerge/BottomView.cpp
@@ -1,6 +1,6 @@
 // TortoiseMerge - a Diff/Patch program\r
 \r
-// Copyright (C) 2006-2008 - TortoiseSVN\r
+// Copyright (C) 2006-2009 - TortoiseSVN\r
 \r
 // This program is free software; you can redistribute it and/or\r
 // modify it under the terms of the GNU General Public License\r
@@ -137,6 +137,7 @@ void CBottomView::UseTheirTextBlock()
                m_pViewData->SetLine(i, m_pwndLeft->m_pViewData->GetLine(i));\r
                bottomstate.linestates[i] = m_pViewData->GetState(i);\r
                m_pViewData->SetState(i, m_pwndLeft->m_pViewData->GetState(i));\r
+               m_pViewData->SetLineEnding(i, EOL_AUTOLINE);\r
                if (IsLineConflicted(i))\r
                {\r
                        if (m_pwndLeft->m_pViewData->GetState(i) == DIFFSTATE_CONFLICTEMPTY)\r
@@ -164,6 +165,8 @@ void CBottomView::UseMyTextBlock()
                m_pViewData->SetLine(i, m_pwndRight->m_pViewData->GetLine(i));\r
                bottomstate.linestates[i] = m_pViewData->GetState(i);\r
                m_pViewData->SetState(i, m_pwndRight->m_pViewData->GetState(i));\r
+               m_pViewData->SetLineEnding(i, EOL_AUTOLINE);\r
+               m_pViewData->SetLineEnding(i, EOL_AUTOLINE);\r
                {\r
                        if (m_pwndRight->m_pViewData->GetState(i) == DIFFSTATE_CONFLICTEMPTY)\r
                                m_pViewData->SetState(i, DIFFSTATE_CONFLICTRESOLVEDEMPTY);\r