Commit dialog support check conflict and mark resolve function.

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

diff --git a/src/TortoiseProc/AppUtils.h b/src/TortoiseProc/AppUtils.h
index 8248bb9..45fc0b0 100644 (file)
--- a/src/TortoiseProc/AppUtils.h
+++ b/src/TortoiseProc/AppUtils.h
@@ -166,6 +166,7 @@ public:
 \r
        static bool IgnoreFile(CTGitPath &file, bool IsMask);\r
        static bool GitReset(CString *CommitHash,int type=1);\r
+       static bool ConflictEdit(CTGitPath &file,bool bAlternativeTool=false);\r
 private:\r
        static CString PickDiffTool(const CTGitPath& file1, const CTGitPath& file2);\r
        static bool GetMimeType(const CTGitPath& file, CString& mimetype);\r