Support merge strategies except octopus
commitc3bbdab7e2d6777c1726974cf9fea58e0c4d6138
authorSup Yut Sum <ch3cooli@gmail.com>
Tue, 5 Feb 2013 16:17:16 +0000 (6 00:17 +0800)
committerSup Yut Sum <ch3cooli@gmail.com>
Tue, 5 Feb 2013 16:17:16 +0000 (6 00:17 +0800)
tree1a200517ed24ea7aef592f0b23d8100c2a5b27b3
parent87fc2e0f349c45bfffe2925c933dfb2967035ae1
Support merge strategies except octopus

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Languages/Tortoise.pot
doc/images/en/Merge.png
src/Changelog.txt
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/AppUtils.cpp
src/TortoiseProc/MergeDlg.cpp
src/TortoiseProc/MergeDlg.h
src/TortoiseProc/resource.h