merge original branch.

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

diff --git a/src/TortoiseProc/GitDiff.h b/src/TortoiseProc/GitDiff.h
index 7826573..a341d71 100644 (file)
--- a/src/TortoiseProc/GitDiff.h
+++ b/src/TortoiseProc/GitDiff.h
@@ -14,4 +14,6 @@ public:
        static int Diff(CTGitPath * pPath1, CTGitPath *pPath2 ,git_revnum_t & rev1, git_revnum_t & rev2, bool blame=false, bool unified=false);\r
        static int SubmoduleDiff(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,bool bIsAdd=true);\r
+       static int DiffCommit(CTGitPath &path, GitRev *r1, GitRev *r2);\r
+       static int DiffCommit(CTGitPath &path, CString &r1, CString &r2);\r
 };\r