Update version number to 1.2.1.0

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

diff --git a/src/TortoiseMerge/MainFrm.h b/src/TortoiseMerge/MainFrm.h
index c6ae01e..9e846ea 100644 (file)
--- a/src/TortoiseMerge/MainFrm.h
+++ b/src/TortoiseMerge/MainFrm.h
@@ -119,7 +119,7 @@ protected:
        DECLARE_MESSAGE_MAP()\r
 protected:\r
        void                    UpdateLayout();\r
-       virtual BOOL    PatchFile(CString sFilePath, CString sVersion, BOOL bAutoPatch);\r
+       virtual BOOL    PatchFile(CString sFilePath, CString sVersion, BOOL bAutoPatch,BOOL bIsReview);\r
        virtual BOOL    DiffFiles(CString sURL1, CString sRev1, CString sURL2, CString sRev2);\r
        int                             CheckResolved();\r
        BOOL                    MarkAsResolved();\r