From 8b99e437e15db2333d1f81adb371883e719a45a7 Mon Sep 17 00:00:00 2001
From: sdottaka <sdottaka@sourceforge.net>
Date: Fri, 3 Oct 2014 02:35:06 +0900
Subject: [PATCH] Fix a compilation error (debug build)

--HG--
branch : stable
---
 Src/MergeEditView.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Src/MergeEditView.h b/Src/MergeEditView.h
index 7766c2517..38b922c89 100644
--- a/Src/MergeEditView.h
+++ b/Src/MergeEditView.h
@@ -124,6 +124,7 @@ public:
 	void SelectNone();
 	void SelectDiff(int nDiff, bool bScroll = true, bool bSelectText = true);
 	virtual CCrystalTextBuffer *LocateTextBuffer ();
+	const CCrystalTextBuffer *LocateTextBuffer () const { return const_cast<CMergeEditView *>(this)->LocateTextBuffer(); };
 	void GetFullySelectedDiffs(int & firstDiff, int & lastDiff);
 	CString GetSelectedText();
 	CString GetLineText(int idx);
-- 
2.11.0