Update version number to 1.2.1.0

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

diff --git a/src/TortoiseMerge/DiffData.h b/src/TortoiseMerge/DiffData.h
index ee698b6..d54220a 100644 (file)
--- a/src/TortoiseMerge/DiffData.h
+++ b/src/TortoiseMerge/DiffData.h
@@ -52,7 +52,7 @@ public:
 \r
 private:\r
        bool DoTwoWayDiff(const CString& sBaseFilename, const CString& sYourFilename, DWORD dwIgnoreWS, bool bIgnoreEOL, apr_pool_t * pool);\r
-       bool DoThreeWayDiff(const CString& sBaseFilename, const CString& sYourFilename, const CString& sTheirFilename, DWORD dwIgnoreWS, bool bIgnoreEOL, bool bIgnoreCase,apr_pool_t * pool);\r
+       bool DoThreeWayDiff(const CString& sBaseFilename, const CString& sYourFilename, const CString& sTheirFilename, DWORD dwIgnoreWS, bool bIgnoreEOL, bool bIgnoreCase, apr_pool_t * pool);\r
 \r
 \r
 public:\r