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 b6162c0..0fe8ffa 100644 (file)
--- a/src/TortoiseProc/GitDiff.h
+++ b/src/TortoiseProc/GitDiff.h
@@ -10,6 +10,8 @@ public:
        ~CGitDiff(void);\r
        static int Parser(git_revnum_t &rev);\r
 \r
-       static int Diff(CTGitPath * pPath, git_revnum_t & rev1, git_revnum_t & rev2, bool blame=false, bool unified=false);\r
+       // 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