void SetParser(const CCmdLineParser& p) {parser = p;}\r
void SetPaths(const CTGitPathList& plist, const CTGitPath path) \r
{ \r
+ orgCmdLinePath = path;\r
CString WinPath=path.GetWinPath();\r
if(WinPath.Left(g_Git.m_CurrentDir.GetLength())==g_Git.m_CurrentDir)\r
cmdLinePath.SetFromWin( WinPath.Right(WinPath.GetLength()-g_Git.m_CurrentDir.GetLength()-1));\r
CCmdLineParser parser;\r
CTGitPathList pathList;\r
CTGitPath cmdLinePath;\r
+ CTGitPath orgCmdLinePath;\r
HWND hwndExplorer;\r
};\r
\r
} \r
else\r
bRet = CAppUtils::StartExtDiff(\r
- path2, cmdLinePath.GetWinPathString(), CString(), CString(),\r
+ path2, orgCmdLinePath.GetWinPathString(), CString(), CString(),\r
CAppUtils::DiffFlags().AlternativeTool(bAlternativeTool));\r
return bRet;\r
}
\ No newline at end of file