Add icons to Scintilla auto-completion: Spelling, File Name, Program Code

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fixed issue #2003: TortoiseMerge uses wrong EOL with patches

Many thanks to Yue Lin Ho for investigating this issue and proposing a fix!

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Add retry button when fetch failed

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Add commit message snippet

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Handle comment char, empty line, escape \t \r \n \\

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Ship a sample commit message file: snippet.txt

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Update documentation about commit message snippet

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fixed issue #1787: auto-complete label when writing commit message

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Merge branch 'snippets'
Use IDs to reference post merge action menu buttons

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Add Push after successful Merge in progress dialog

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fixed issue #2234: Config file mess up if not end with LF

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Introduce CGit::GetConfigValueInt32()

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
diff.context can be 0, so use -1 to indicate default value

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Add an option to the TortoiseGitMerge settings dialog to specify the number of context lines in a patch file

For TortoiseGitMerge, set context lines settings to -1 to use the value from diff.context

Based on TortoiseSVN revision 25542

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

(Fixes issue #2238)

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

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Document advanced settings SanitizeCommitMsg

(Fixes issue #2242)

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fixed issue #2241: Cleanup: result window of dry run should offer to "really remove"

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Handle cursor files as icons when diffing

Based on TortoiseSVN revision 25702

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