TortoiseGitMerge: Add Mark block and Use left file except marked blocks
commit1c94305c437c5543cc918d9ccdbca4e8622c1d1e
authorSup Yut Sum <ch3cooli@gmail.com>
Mon, 10 Mar 2014 15:17:13 +0000 (10 23:17 +0800)
committerSup Yut Sum <ch3cooli@gmail.com>
Mon, 10 Mar 2014 15:17:13 +0000 (10 23:17 +0800)
tree88122dc530a2dd681035f24f6b4304dea857e285
parent652a29d51c59996d432001acc0ab1746699861e7
TortoiseGitMerge: Add Mark block and Use left file except marked blocks

This facilities partial commit (Restore after commit in TortoiseGit).
Based on TortoiseSVN revision 25282-25285.

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
src/Resources/TortoiseMergeENG.rc
src/Resources/linemarked.ico [new file with mode: 0644]
src/TortoiseMerge/BaseView.cpp
src/TortoiseMerge/BaseView.h
src/TortoiseMerge/RightView.cpp
src/TortoiseMerge/RightView.h
src/TortoiseMerge/TortoiseMerge.vcxproj
src/TortoiseMerge/TortoiseMerge.vcxproj.filters
src/TortoiseMerge/ViewData.h
src/TortoiseMerge/resource.h