OSDN Git Service
(root)
/
tortoisegit
/
TortoiseGitJp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Add Show Whole Project Checkbox at commitdlg.
[tortoisegit/TortoiseGitJp.git]
/
src
/
Git
/
Git.h
diff --git
a/src/Git/Git.h
b/src/Git/Git.h
index
99c41a1
..
856c71c
100644
(file)
--- a/
src/Git/Git.h
+++ b/
src/Git/Git.h
@@
-100,6
+100,7
@@
public:
\r
BOOL IsInitRepos();
\r
static BOOL IsVista();
\r
+ int ListConflictFile(CTGitPathList &list,CTGitPath *path=NULL);
\r
\r
};
\r
extern void GetTempPath(CString &path);
\r