Method OnFileOpenConflict

Src/MainFrm.cpp:2931–2938

* @brief Called when user selects File/Open Conflict... */

 * @brief Called when user selects File/Open Conflict...
 */
void CMainFrame::OnFileOpenConflict()
{
	String conflictFile;
	if (SelectFile(GetSafeHwnd(), conflictFile))
	{
		DoOpenConflict(conflictFile);
	}
}

/**
 * @brief Called when user selects File/Open Clipboard