From: Junio C Hamano Date: Tue, 3 Mar 2015 22:37:02 +0000 (-0800) Subject: Merge branch 'jc/apply-ws-fix-expands-report' X-Git-Tag: v2.4.0-rc0~78 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73b690a634b7065471144e0b97c74f30cef2acef;p=thirdparty%2Fgit.git Merge branch 'jc/apply-ws-fix-expands-report' "git apply --whitespace=fix" fixed whitespace errors in the common context lines but did so without reporting. * jc/apply-ws-fix-expands-report: apply: detect and mark whitespace errors in context lines when fixing --- 73b690a634b7065471144e0b97c74f30cef2acef