From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Jan 2017 23:59:21 +0000 (-0800)
Subject: Merge branch 'vn/diff-ihc-config'
X-Git-Tag: v2.12.0-rc0~50
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8ec68d1ae2863823b74d67c5e92297e38bbf97bc

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
---

8ec68d1ae2863823b74d67c5e92297e38bbf97bc