#include "direct.h"
#include "MainFrm.h"
-#include "DiffView.h"
#include "diff.h"
#include "getopt.h"
CleanupTempFiles();
}
-void CMergeDoc::OnFileEvent (WPARAM wEvent, LPCTSTR pszPathName)
+void CMergeDoc::OnFileEvent (WPARAM /*wEvent*/, LPCTSTR /*pszPathName*/)
{
/*if (!(theApp.m_dwFlags & EP_NOTIFY_CHANGES))
return;
}
-void CMergeEditView::OnUpdateAllLeft(CCmdUI* pCmdUI)
+void CMergeEditView::OnUpdateAllLeft(CCmdUI* /*pCmdUI*/)
{
// TODO: Add your command update UI handler code here
}
-void CMergeEditView::OnUpdateAllRight(CCmdUI* pCmdUI)
+void CMergeEditView::OnUpdateAllRight(CCmdUI* /*pCmdUI*/)
{
// TODO: Add your command update UI handler code here
}
-void CMergeEditView::OnUpdateEditUndo(CCmdUI* pCmdUI)
+void CMergeEditView::OnUpdateEditUndo(CCmdUI* /*pCmdUI*/)
{
// TODO: Add your command update UI handler code here