TortoiseGitMerge does not require gitdll.dll directly

Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit f1eb4a0d1e4f0ab0a83b6d7b0c6a685e7a7ef093)
TGitMerge: After saving a conflicted versioned file, ask whether to mark the file as resolved

Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit 8acd1ad34c611e1403bb96b78246203e0fecbc2b)
Fixed issue #1611: Changing Search criteria with empty search field refreshes log content

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fixed issue #1620: Apply Patch serial can't open file dialog on WinXP

Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit 03663a754d9171297f222e2933f635cd7b007327)
Add refresh (press F5) function in Changed Files Dialog

This is useful when comparing to working copy

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
(cherry picked from commit 7e4ef1d3945729a93d2ea66a7c8819f35b4c8594)
Close handles only not equal to INVALID_HANDLE_VALUE

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
(cherry picked from commit e85039536a1dddc35738f1928eb01d0c6f42bb7a)
Detect msysgit installation with user-rights

Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit 7633c5dc49fbf59e32e366d5ae062375b8562f72)
git.exe of msysgit cmd folder does not work, so try to guess bin folder

Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit ac70a9e327c9ffe2c037a7c0a336938d1f1f12fc)
Fixed typo introduced in last commit

Win32 build was broken.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit 9bfdfb26cf89f725d2e76bfd1ef9040405929ad4)
Fixed issue #1619: TortoiseGitMerge: Ribbon UI/toolbars can be toggled

Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit dae46c74c99d4364080c9c0101e3b298b268d08d)
Fixed issue #1623: Search by email in Log window

Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit 1536ac0a74d000fd7fc518b344cceb5bfb2be3a3)
Fixed typo

Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit c2b915da6c0472c6263ac10812a866631b2331bf)
Reload tracking relationship info on refreshing log list

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
(cherry picked from commit 58a54e5d236e9b796072783425d38949d7d1bc83)
Do not select last selected item if user has selected another item

Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit ec865f82ce10b6d77c126f9ce75df03ab483c2d1)
Enable the moved-blocks detection by default

Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit 80d68c362959bfbd9b85ecd45ebd27e76e4de61d)
Improve the caret positioning when clicking on a line

Based on TortoiseSVN revision 23881.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit 2a0f0d12465c1aed982b1fbcf83511b3462b34c7)
Show all selected filters

Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit 18b81ab4108cfde23d8b971333fd34b052a0b612)
Updated libgit2

(fixes issue #1627)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
(cherry picked from commit c04812f2400c687b138eb2a0243a2b3df191e69c)
Fixed issue #1624: Easier navigation in revision graph with mouse

Add move canvas by mouse

Signed-off-by: Frank Li <lznuaa@gmail.com>
(cherry picked from commit 47c462162460198c3b6c383c7ac5bfd94a1af7d3)
StatGraph: rename some variable and clean up code

Signed-off-by: Frank Li <lznuaa@gmail.com>
(cherry picked from commit 059c177f11a41ef5bdc7fde758cc4e37ad3b9b01)