X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=blobdiff_plain;f=src%2FTortoiseMerge%2FBaseView.h;h=b0635fc53a36bebb5d36a263d26853610ef4b513;hp=0975d9f8b464ce3ec983b07739ecfb8546ebf0fb;hb=f31db5cce6f6f73b66e9fd339acb6ff0ba15b3fa;hpb=103b96ec7f3fc1627384365c22fb7c98ebf31013;ds=sidebyside

diff --git a/src/TortoiseMerge/BaseView.h b/src/TortoiseMerge/BaseView.h
index 0975d9f..b0635fc 100644
--- a/src/TortoiseMerge/BaseView.h
+++ b/src/TortoiseMerge/BaseView.h
@@ -18,7 +18,7 @@
 //
 #pragma once
 #include "DiffData.h"
-//#include "SVNLineDiff.h"
+#include "SVNLineDiff.h"
 #include "ScrollTool.h"
 #include "Undo.h"
 #include "LocatorBar.h"
@@ -125,6 +125,7 @@ protected:
 	afx_msg void	OnLButtonDown(UINT nFlags, CPoint point);
 	afx_msg void	OnEditCopy();
 	afx_msg void	OnMouseMove(UINT nFlags, CPoint point);
+	afx_msg void	OnTimer(UINT_PTR nIDEvent);
 	afx_msg void	OnMouseLeave();
 	afx_msg void	OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
 	afx_msg void	OnCaretDown();
@@ -211,7 +212,7 @@ protected:
 	void			DrawText(CDC * pDC, const CRect &rc, LPCTSTR text, int textlength, int nLineIndex, POINT coords, bool bModified, bool bInlineDiff);
 	void			ClearCurrentSelection();
 	void			AdjustSelection();
-	void            SelectNextBlock(int nDirection, bool bConflict);
+	void			SelectNextBlock(int nDirection, bool bConflict, bool bSkipEndOfCurrentBlock = true);
 
 	void			RemoveLine(int nLineIndex);
 	void			RemoveSelectedText();
@@ -232,7 +233,7 @@ protected:
 	COLORREF		m_WhiteSpaceFg;
 	UINT			m_nStatusBarID;		///< The ID of the status bar pane used by this view. Must be set by the parent class.
 
-//	SVNLineDiff		m_svnlinediff;
+	SVNLineDiff		m_svnlinediff;
 	BOOL			m_bOtherDiffChecked;
 	BOOL			m_bModified;
 	BOOL			m_bFocused;