From: Junio C Hamano Date: Mon, 27 Feb 2017 21:57:17 +0000 (-0800) Subject: Merge branch 'vn/xdiff-func-context' X-Git-Tag: v2.13.0-rc0~157 X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=9720b302479639253518d39ec758241d91275ee6;p=git.git Merge branch 'vn/xdiff-func-context' "git diff -W" has been taught to handle the case where a new function is added at the end of the file better. * vn/xdiff-func-context: xdiff -W: relax end-of-file function detection --- 9720b302479639253518d39ec758241d91275ee6