Merge branch 'vn/diff-ihc-config' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2017 22:56:06 +0000 (14:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2017 22:56:06 +0000 (14:56 -0800)
commitac4915dbe6b7ec1c62920e22259284822f05d400
tree9cffe0781a41ead1f5a9763a83c864804ddc257a
parent2e8a38b1cc6cb5ec68bfe4da34f8629f5199991f
parentc488867793dc9b273c1d35746452d44afcd3d7f5
Merge branch 'vn/diff-ihc-config' into next

"git diff" learned diff.interHunkContext configuration variable
that gives the default value for its --inter-hunk-context option.

* vn/diff-ihc-config:
  diff: add interhunk context config option