err=1;\r
break;\r
}\r
+ this->m_ctrlCmdOut.SetSel(-1,-1);\r
+ this->m_ctrlCmdOut.ReplaceSel(cmd+_T("\n"));\r
+ this->m_ctrlCmdOut.SetSel(-1,-1);\r
+ this->m_ctrlCmdOut.ReplaceSel(output);\r
}\r
- this->m_ctrlCmdOut.SetSel(-1,-1);\r
- this->m_ctrlCmdOut.ReplaceSel(output);\r
+ \r
\r
CString newhash=g_Git.GetHash(CString(_T("HEAD"))); \r
\r
this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,true);\r
\r
this->AddDiffFileList(&m_InChangeFileList,&m_arInChangeList,newhash,oldhash);\r
+ m_InLogList.FillGitLog(NULL,CGit:: LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE,\r
+ &oldhash,&newhash);\r
}\r
\r
+ this->m_ctrlTabCtrl.ShowTab(IDC_CMD_LOG-1,true);\r
+\r
if(err)\r
{\r
this->ShowTab(IDC_CMD_LOG);\r
TRACE0("Failed to create output change files window\n");\r
return FALSE; // fail to create\r
}\r
- m_ctrlTabCtrl.InsertTab(&m_InChangeFileList,_T("Out ChangeList"),-1);\r
+ m_ctrlTabCtrl.InsertTab(&m_InChangeFileList,_T("In ChangeList"),-1);\r
\r
m_InChangeFileList.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("OutSyncDlg"),\r
(CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_COMPARETWO)|\r