Merge

diff --cc Src/ImgMergeFrm.cpp
Simple merge

diff --cc Src/MainFrm.cpp
index 33b27cc,c50e624..399dbda
--- 1/Src/MainFrm.cpp
--- 2/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@@ -997,9 -987,13 +987,9 @@@ BOOL CMainFrame::DoFileOpen(const PathC
        {
                if (pDirDoc)
                {
 -                      if (tFiles.GetSize() == 3)
 -                      {
 -                              AfxMessageBox(_T("3-way folder compare feature is in progress"), MB_ICONWARNING | MB_DONT_ASK_AGAIN);
 -                      }
                        // Anything that can go wrong inside InitCompare() will yield an
                        // exception. There is no point in checking return value.
-                       pDirDoc->InitCompare(files, bRecurse, pTempPathContext);
+                       pDirDoc->InitCompare(tFiles, bRecurse, pTempPathContext);
  
                        pDirDoc->SetReportFile(sReportFile);
                        pDirDoc->SetDescriptions(strDesc);

diff --cc Src/Merge.rc
Simple merge

diff --cc Src/Test.cpp
Simple merge