OSDN Git Service

TortoiseMerge Basic Support Git patch created by format patch
[tortoisegit/TortoiseGitJp.git] / src / TortoiseMerge / RightView.cpp
index d3e44c7..30a1a1f 100644 (file)
@@ -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
@@ -182,6 +182,7 @@ void CRightView::UseFile(bool refreshViews /* = true */)
                        m_pwndBottom->m_pViewData->SetLine(i, m_pViewData->GetLine(i));\r
                        bottomstate.linestates[i] = m_pwndBottom->m_pViewData->GetState(i);\r
                        m_pwndBottom->m_pViewData->SetState(i, m_pViewData->GetState(i));\r
+                       m_pwndBottom->m_pViewData->SetLineEnding(i, m_pViewData->GetLineEnding(i));\r
                        if (m_pwndBottom->IsLineConflicted(i))\r
                                m_pwndBottom->m_pViewData->SetState(i, DIFFSTATE_CONFLICTRESOLVED);\r
                }\r
@@ -193,6 +194,7 @@ void CRightView::UseFile(bool refreshViews /* = true */)
                {\r
                        rightstate.difflines[i] = m_pViewData->GetLine(i);\r
                        m_pViewData->SetLine(i, m_pwndLeft->m_pViewData->GetLine(i));\r
+                       m_pViewData->SetLineEnding(i, m_pwndLeft->m_pViewData->GetLineEnding(i));\r
                        DiffStates state = m_pwndLeft->m_pViewData->GetState(i);\r
                        switch (state)\r
                        {\r
@@ -248,6 +250,7 @@ void CRightView::UseBlock(bool refreshViews /* = true */)
                        m_pwndBottom->m_pViewData->SetLine(i, m_pViewData->GetLine(i));\r
                        bottomstate.linestates[i] = m_pwndBottom->m_pViewData->GetState(i);\r
                        m_pwndBottom->m_pViewData->SetState(i, m_pViewData->GetState(i));\r
+                       m_pwndBottom->m_pViewData->SetLineEnding(i, EOL_AUTOLINE);\r
                        if (m_pwndBottom->IsLineConflicted(i))\r
                        {\r
                                if (m_pViewData->GetState(i) == DIFFSTATE_CONFLICTEMPTY)\r
@@ -264,6 +267,7 @@ void CRightView::UseBlock(bool refreshViews /* = true */)
                {\r
                        rightstate.difflines[i] = m_pViewData->GetLine(i);\r
                        m_pViewData->SetLine(i, m_pwndLeft->m_pViewData->GetLine(i));\r
+                       m_pViewData->SetLineEnding(i, EOL_AUTOLINE);\r
                        DiffStates state = m_pwndLeft->m_pViewData->GetState(i);\r
                        switch (state)\r
                        {\r