OSDN Git Service

Add handle "Delete Conflict" at conflict edit.
authorFrank Li <lznuaa@gmail.com>
Fri, 27 Feb 2009 14:37:14 +0000 (22:37 +0800)
committerFrank Li <lznuaa@gmail.com>
Fri, 27 Feb 2009 14:37:14 +0000 (22:37 +0800)
commitd7a9c05ca0e619745717aed22cdc0067ebc619aa
treeeeea521ba696be7e73b3ac92bc83c894e28f7926
parent65fac15c13c509ce09c3f76de8f1a7c6c963bf5b
Add handle "Delete Conflict" at conflict edit.

Signed-off-by: Frank Li <lznuaa@gmail.com>
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/AppUtils.cpp
src/TortoiseProc/AppUtils.h
src/TortoiseProc/DeleteConflictDlg.cpp [new file with mode: 0644]
src/TortoiseProc/DeleteConflictDlg.h [new file with mode: 0644]
src/TortoiseProc/TortoiseProc.vcproj
src/TortoiseProc/resource.h