Merge branch 'vn/xdiff-func-context'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2017 21:57:17 +0000 (13:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2017 21:57:17 +0000 (13:57 -0800)
commit9720b30...479639253518d39ec758241d91275ee6
tree65ad628...90b752d0f33009becd4fde1f71a9a591copy hash to clipboard (tree)
parent39b8980...b9eacfff0f28101e71354350fdfc5340copy hash to clipboard (diff)
parent540d3eb...ebad425f0902cbca0549288fe627f058copy hash to clipboard (diff)