Add Merge command at log context menu
commit6877cebde148025507deaa250ee4029253e262a5
authorFrank Li <lznuaa@gmail.com>
Mon, 5 Apr 2010 08:03:15 +0000 (5 16:03 +0800)
committerFrank Li <lznuaa@gmail.com>
Mon, 5 Apr 2010 08:03:15 +0000 (5 16:03 +0800)
tree66228cbc4d5146f8ccff84efa62734f114e56349
parentead7ca73d3039bf9aa13aee7f23539eed06b5b5e
Add Merge command at log context menu

Signed-off-by: Frank Li <lznuaa@gmail.com>
src/Resources/TortoiseCommon.rc2
src/TortoiseProc/AppUtils.cpp
src/TortoiseProc/AppUtils.h
src/TortoiseProc/ChooseVersion.h
src/TortoiseProc/Commands/MergeCommand.cpp
src/TortoiseProc/GitLogListAction.cpp
src/TortoiseProc/GitLogListBase.cpp
src/TortoiseProc/MergeDlg.cpp