OSDN Git Service

Add conflict handle
authorFrank Li <lznuaa@gmail.com>
Thu, 22 Jan 2009 07:32:51 +0000 (15:32 +0800)
committerFrank Li <lznuaa@gmail.com>
Thu, 22 Jan 2009 07:32:51 +0000 (15:32 +0800)
commit5c423fd2c3a69c9f6775fe321f747c2299764a19
treeedde1661ca0e0b3b606fa3d0cae8242693f6ea5f
parentf1816999a44ea2c0c8404fbeb7badf20a49cebc4
Add conflict handle
13 files changed:
src/Git/GitStatusListCtrl.cpp
src/Git/GitStatusListCtrl.h
src/Git/TGitPath.cpp
src/Git/TGitPath.h
src/TortoiseProc/Commands/Command.cpp
src/TortoiseProc/Commands/ConflictEditorCommand.cpp [new file with mode: 0644]
src/TortoiseProc/Commands/ConflictEditorCommand.h
src/TortoiseProc/GitDiff.cpp
src/TortoiseProc/GitDiff.h
src/TortoiseProc/GitLogListAction.cpp
src/TortoiseProc/GitLogListBase.cpp
src/TortoiseProc/GitLogListBase.h
src/TortoiseProc/TortoiseProc.vcproj