_T("1None.txt"),\r
_T("1CRLF.txt"),\r
_T("3None.txt"),\r
- _T("3CRLF.txt")\r
+ _T("3CRLF.txt"),\r
+ _T("2-3CRLF.txt")\r
};\r
CMessageBoxDialog dlg(nullptr, IDS_FILESSAME, 0U, 0U, IDS_FILESSAME);\r
const int nPrevFormerResult = dlg.SetFormerResult(IDOK);\r
else\r
{\r
CMergeEditView *pView = pDoc->GetView(0, 0); // merge\r
- EXPECT_EQ(1, pDoc->m_diffList.GetSize());\r
+ EXPECT_LE(1, pDoc->m_diffList.GetSize());\r
pDoc->CopyAllList(0, 1);\r
EXPECT_EQ(0, pDoc->m_diffList.GetSize());\r
// undo\r
pView->SendMessage(WM_COMMAND, ID_EDIT_UNDO);\r
- EXPECT_EQ(1, pDoc->m_diffList.GetSize());\r
+ EXPECT_LE(1, pDoc->m_diffList.GetSize());\r
// insert a character at the last line\r
pView->GotoLine(pDoc->m_ptBuf[0]->GetLineCount() - 1, false, 0);\r
pView->SendMessage(WM_CHAR, 'a');\r