Merge branch 'vn/diff-ihc-config'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Jan 2017 23:59:21 +0000 (15:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Jan 2017 23:59:21 +0000 (15:59 -0800)
commit8ec68d1ae2863823b74d67c5e92297e38bbf97bc
treed3136e669a64ea0c2ebefe7e2a000493bf8ee580
parente801be066cc12799cd053a5b4eb792d9007133fc
parentc488867793dc9b273c1d35746452d44afcd3d7f5
Merge branch 'vn/diff-ihc-config'

"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