Zero initialize the whole struct instead of only 'menuID'

Based on TortoiseSVN revision 25526

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Revert "Disable scintilla assert in order to enter commit message in debug mode"

This reverts commit a60359019362384b2b78a2b8b8325695f9c0bc01.

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Define NDEBUG in ScintillaLexer.vcxproj

TortoiseSVN does the same

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Update Scintilla to version 3.4.3

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Applied backgroundcolors.patch

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Merge branch 'scintilla'
Do all string transformation before storing to member variable

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fixed issue #1973: Support INS/OVR mode in TortoiseMerge

Based on TortoiseSVN rev. #25529.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
TortoiseGitMerge: Adjust OVR mode cursor width to exact char width

Based on TortoiseSVN revision 25530

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fix crash if cannot get DC to show CMessageBox, fallback to ::MessageBox

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Add a "replace" and a "replace all" button to the TMerge find dialog

Based on TortoiseSVN revisions #25531, #25533, #25536, and #25537.

(fixes issue #1970)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Synced with TortoiseMerge

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Allow to replace with empty string, and disable replace textbox and buttons when they should

Based on TortoiseSVN revision 25538, 25540

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TortoiseGit's find combox is case sensitive, so replace combobox should also be

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Update Tortoise.pot

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Merge branch 'tmerge-replace'
git diff --no-index exit code 1 means there are differences, not an error

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TortoiseGitMerge: Update doc about Ctrl+F Find dialog also has replace function

Based on TortoiseSVN revision 25548

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Add missing anchor

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Update screenshots

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>