Merge "Distinguish between error and timeout in intraline diff error message"