dropped unused TortoiseSVN resolve conflict dialog