OSDN Git Service

Add no-commit option at merge dialog
authorFrank Li <lznuaa@gmail.com>
Mon, 19 Oct 2009 05:17:46 +0000 (13:17 +0800)
committerFrank Li <lznuaa@gmail.com>
Mon, 19 Oct 2009 05:17:46 +0000 (13:17 +0800)
commit4f945f578d8e3942c7b1cc78e381f0f2aa0928dd
treef5fc95d1a12d2639823e38ea9bb1525f32896657
parentdb8464ba7371f55229c45b018760e43d1c375599
Add no-commit option at merge dialog

Signed-off-by: Frank Li <lznuaa@gmail.com>
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/Commands/MergeCommand.cpp
src/TortoiseProc/MergeDlg.cpp
src/TortoiseProc/MergeDlg.h
src/TortoiseProc/resource.h
src/TortoiseShell/resource.h
src/TortoiseShell/resourceshell.rc