Use ACP replace OEMCP.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / Commands / MergeCommand.cpp

diff --git a/src/TortoiseProc/Commands/MergeCommand.cpp b/src/TortoiseProc/Commands/MergeCommand.cpp
index 2b35fcc..ff5a530 100644 (file)
--- a/src/TortoiseProc/Commands/MergeCommand.cpp
+++ b/src/TortoiseProc/Commands/MergeCommand.cpp
@@ -43,7 +43,7 @@ bool MergeCommand::Execute()
                        dlg.m_VersionName);\r
 \r
                CString output;\r
-               g_Git.Run(cmd,&output,CP_OEMCP);\r
+               g_Git.Run(cmd,&output,CP_ACP);\r
 \r
                CMessageBox::Show(NULL,output,_T("TortoiseGit"),MB_OK);\r
        }\r