Pull: Disable --no-ff when --ff-only is checked and vice versa

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Initialize member variables in the constructor

Based on TortoiseSVN revision 25312

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Use IsViewGood() to check the pointer first before accessing it

Based on TortoiseSVN revision 25314

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Reverse new and old rev when diffing using libgit2

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Can diff a single file instead of whole tree using libgit2

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

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fix crash when applying patch in TortoiseGitMerge

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

Based on TortoiseSVN revision 25330

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fix crash when moving Patch View Dialog

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

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

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Merge branch 'scintilla'
Show regex error messge in AutoTextTestDlg

Based on TortoiseSVN revision 25351

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Do not add unneeded context menu separators at the end of Scintilla Context Menu

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Export Dialog: Make sure to enable OK button after selecting file

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Do not say "newer commit time" if any of the 2 commits are working copy / invalid commits

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TortoiseGitMerge: Fix background of the info label in the find dialog

Based on TortoiseSVN revision 25364, 25366

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fixed issue #2147: Resolve not dealing correctly with (modify/delete) conflicts

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Change default gravatar URL to http://www.gravatar.com/avatar/%HASH%?d=identicon

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

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