From: Jeff King <peff@peff.net>
Date: Thu, 25 Oct 2012 10:41:57 +0000 (-0400)
Subject: Merge branch 'jm/diff-context-config'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8de8f9f656696a3c04e5f0a274b57e4a719a66ce;p=git.git

Merge branch 'jm/diff-context-config'

Teaches a new configuration variable to "git diff" Porcelain and
its friends.

* jm/diff-context-config:
  t4055: avoid use of sed 'a' command
  diff: diff.context configuration gives default to -U
---

8de8f9f656696a3c04e5f0a274b57e4a719a66ce