Add conflict handle

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / GitDiff.cpp

diff --git a/src/TortoiseProc/GitDiff.cpp b/src/TortoiseProc/GitDiff.cpp
index cfed705..ff446c1 100644 (file)
--- a/src/TortoiseProc/GitDiff.cpp
+++ b/src/TortoiseProc/GitDiff.cpp
@@ -19,7 +19,7 @@ int CGitDiff::Parser(git_revnum_t &rev)
                CString cmd;\r
                cmd.Format(_T("git.exe rev-parse %s"),rev);\r
                CString output;\r
-               if(!g_Git.Run(cmd,&output))\r
+               if(!g_Git.Run(cmd,&output,CP_UTF8))\r
                {\r
                        //int start=output.Find(_T('\n'));\r
                        rev=output.Left(40);\r
@@ -108,3 +108,8 @@ int CGitDiff::Diff(CTGitPath * pPath,CTGitPath * pPath2, git_revnum_t & rev1, gi
 \r
        return 0;\r
 }\r
+\r
+int CGitDiff::StartConflictEditor(CTGitPath* file)\r
+{\r
+       return 0;\r
+}
\ No newline at end of file