OSDN Git Service

Commit dialog support check conflict and mark resolve function.
authorFrank Li <lznuaa@gmail.com>
Thu, 22 Jan 2009 16:13:29 +0000 (00:13 +0800)
committerFrank Li <lznuaa@gmail.com>
Thu, 22 Jan 2009 16:13:29 +0000 (00:13 +0800)
commit1aca636da79028349bb7bc39d4bcaddb7e9f6396
tree25e624f356c6b5b1a0f1678fca37829ef1fb3c2f
parenta2c8b7d75cd39285cd1e65b3e0bb10a3ae849c33
Commit dialog support check conflict and mark resolve function.

Signed-off-by: Frank Li <lznuaa@gmail.com>
src/Git/GitStatusListCtrl.cpp
src/TortoiseGitBlame/TortoiseGitBlame.vcproj
src/TortoiseProc/AppUtils.cpp
src/TortoiseProc/AppUtils.h
src/TortoiseProc/Commands/CleanupCommand.cpp
src/TortoiseProc/Commands/ConflictEditorCommand.cpp
src/TortoiseProc/CommitDlg.cpp
src/TortoiseProc/TortoiseProc.vcproj