fix some build error

[tortoisegit/TortoiseGitJp.git] / src / TortoiseMerge / DiffData.cpp

diff --git a/src/TortoiseMerge/DiffData.cpp b/src/TortoiseMerge/DiffData.cpp
index 149e86d..ed078ec 100644 (file)
--- a/src/TortoiseMerge/DiffData.cpp
+++ b/src/TortoiseMerge/DiffData.cpp
@@ -17,14 +17,14 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
 //\r
 #include "StdAfx.h"\r
-#include "diff.h"\r
+//#include "diff.h"\r
 #include "TempFiles.h"\r
 #include "registry.h"\r
 #include "Resource.h"\r
 #include "Diffdata.h"\r
 #include "UnicodeUtils.h"\r
-#include "SVNAdminDir.h"\r
-#include "svn_dso.h"\r
+#include "GitAdminDir.h"\r
+\r
 \r
 #pragma warning(push)\r
 #pragma warning(disable: 4702) // unreachable code\r