Follow first parent work at log dialog

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

diff --git a/src/TortoiseProc/GitDiff.h b/src/TortoiseProc/GitDiff.h
index a2e5385..0fe8ffa 100644 (file)
--- a/src/TortoiseProc/GitDiff.h
+++ b/src/TortoiseProc/GitDiff.h
@@ -13,4 +13,5 @@ public:
        // Use two path to handle rename cases\r
        static int Diff(CTGitPath * pPath1, CTGitPath *pPath2 ,git_revnum_t & rev1, git_revnum_t & rev2, bool blame=false, bool unified=false);\r
        static int DiffNull(CTGitPath *pPath, git_revnum_t &rev1);\r
+       static int StartConflictEditor(CTGitPath* filepath);\r
 };\r