Fixed issue #2157: TortoiseGitMerge does not delete temporary files on close (marking as "resolved" in TGit was necessary)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fixed issue #1950: Log Dialog: File list filter

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Refactored: Move some logic to CGitDiff

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Add resolve submodule conflict dialog

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Refactored: Move conflict resolve code to CAppUtils

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Allow to resolve submodule conflicts and update list

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fixed issue #2330: Optimize submodule conflict resolution

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Do not open RebaseDlg twice after Fetch

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fixed issue #2332: TortoiseGitMerge: Move "Create patch file" to the File menu

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Remove %GIT_DIR% before calling git.exe

This fixes diff nested submodule failure

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fix FF rebase failure (regression of 59b422d3dae39b681fd82a6e4bd356a016eed7c3)

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

Signed-off-by: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
Signed-off-by: Sven Strickroth <email@cs-ware.de>