TGitCache: Correctly show file status for delete-modify conflict

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Refresh file list if we don't know if conflict was successfully resolved

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Block working tree and re-crawl after resolving conflicts

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Show filename in DeleteConflictDlg and fix optics

Signed-off-by: Sven Strickroth <email@cs-ware.de>
DeleteConflictDlg: Make abort the default action

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Merge branch 'delete-modify-conflict'
Improve documentation for conflict resolution

Signed-off-by: Sven Strickroth <email@cs-ware.de>