OSDN Git Service
(root)
/
tortoisegit
/
TortoiseGitJp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e04ee7d
)
re-added accidently removed vars, while resolving conflict during rebase
author
Myagi
<snowcoder@gmail.com>
Tue, 27 Jan 2009 17:41:21 +0000
(18:41 +0100)
committer
Frank Li
<lznuaa@gmail.com>
Wed, 28 Jan 2009 03:14:44 +0000
(11:14 +0800)
src/Git/TGitPath.h
patch
|
blob
|
history
diff --git
a/src/Git/TGitPath.h
b/src/Git/TGitPath.h
index
f6ea8b4
..
2de7577
100644
(file)
--- a/
src/Git/TGitPath.h
+++ b/
src/Git/TGitPath.h
@@
-254,6
+254,11
@@
private:
mutable CStringA m_sUTF8FwdslashPath;
\r
mutable CStringA m_sUTF8FwdslashPathEscaped;
\r
mutable CString m_sProjectRoot;
\r
mutable CStringA m_sUTF8FwdslashPath;
\r
mutable CStringA m_sUTF8FwdslashPathEscaped;
\r
mutable CString m_sProjectRoot;
\r
+
\r
+ //used for rename case
\r
+ mutable CString m_sOldBackslashPath;
\r
+ mutable CString m_sOldFwdslashPath;
\r
+
\r
// Have we yet determined if this is a directory or not?
\r
mutable bool m_bDirectoryKnown;
\r
mutable bool m_bIsDirectory;
\r
// Have we yet determined if this is a directory or not?
\r
mutable bool m_bDirectoryKnown;
\r
mutable bool m_bIsDirectory;
\r