Added ability to use checkintool when TFS merge fails