Merged in jdunne525/winmerge-v2 (pull request #1)

More on Issue #73 Fixed the -dl -dm and -dr description parameters for conflict files (for both 2 way and 3 way conflict files).

Approved-by: Takashi Sawanaka <[email protected]>

Author: sdottaka

Src/MainFrm.cpp

@@ -2334,7 +2334,7 @@ BOOL CMainFrame::DoOpenConflict(const String& conflictFile, const String strDesc
 		{
 			String strDesc2[2] = { 
 				(strDesc && !strDesc[0].empty()) ? strDesc[0] : _("Theirs File"),
-				(strDesc && !strDesc[1].empty()) ? strDesc[1] : _("Mine File") };
+				(strDesc && !strDesc[2].empty()) ? strDesc[2] : _("Mine File") };
 			DWORD dwFlags[2] = {FFILEOPEN_READONLY | FFILEOPEN_NOMRU, FFILEOPEN_NOMRU | FFILEOPEN_MODIFIED};
 			conflictCompared = DoFileOpen(&PathContext(revFile, workFile), 
 						dwFlags, strDesc2);

Src/Merge.cpp

@@ -707,6 +707,10 @@ BOOL CMergeApp::ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainF
 			}
 			else if (IsConflictFile(sFilepath))
 			{
+				//For a conflict file, load the descriptions in their respective positions:  (they will be reordered as needed)
+				strDesc[0] = cmdInfo.m_sLeftDesc;
+				strDesc[1] = cmdInfo.m_sMiddleDesc;
+				strDesc[2] = cmdInfo.m_sRightDesc;
 				bCompared = pMainFrame->DoOpenConflict(sFilepath, strDesc);
 			}
 			else