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>