* Use git apply when a patch starts with git --diff * Adjust heuristic so that discarded_files parameter works on these patches Part of TA07-020