Handle test cancellation in diffenginetray#682

SimonCropp merged 2 commits intomainVerifyTests/DiffEngine:mainfrom

handle-test-cancellationVerifyTests/DiffEngine:handle-test-cancellationCopy head branch name to clipboard