Installer: Textual change

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

diff --git a/src/TortoiseMerge/AppUtils.h b/src/TortoiseMerge/AppUtils.h
index a545cb7..96a5ccf 100644 (file)
--- a/src/TortoiseMerge/AppUtils.h
+++ b/src/TortoiseMerge/AppUtils.h
@@ -17,10 +17,9 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
 //\r
 #pragma once\r
-//#include "svn_types.h"\r
-#include "GitStatus.h"\r
+#include "svn_types.h"\r
 \r
-class CProgressDlg;\r
+class CSysProgressDlg;\r
 \r
 /**\r
  * \ingroup TortoiseMerge\r
@@ -41,7 +40,7 @@ public:
         * \param hWnd the window handle of the calling app\r
         * \return TRUE if successful\r
         */\r
-       static BOOL GetVersionedFile(CString sPath, CString sVersion, CString sSavePath, CProgressDlg * progDlg, HWND hWnd = NULL);\r
+       static BOOL GetVersionedFile(CString sPath, CString sVersion, CString sSavePath, CSysProgressDlg * progDlg, HWND hWnd = NULL);\r
        \r
        /**\r
         * Creates a unified diff from two files\r
@@ -49,6 +48,6 @@ public:
        static bool CreateUnifiedDiff(const CString& orig, const CString& modified, const CString& output, bool bShowError);\r
 \r
        static bool HasClipboardFormat(UINT format);\r
-       static CString GetErrorString(git_error_t * Err);\r
+       static CString GetErrorString(svn_error_t * Err);\r
 \r
 };\r