TGitMerge: Better handle conflicts when applying patches

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Highlight files with conflicts

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Merge branch 'tgitmerge_patch_conflict'

Signed-off-by: Sven Strickroth <email@cs-ware.de>
CommitDlg: Reverting an added file made some entry appear twice

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fixed issue #1589: Clone Dialog's URL case sensitivity causes issues with folder creation

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