Merge branch 'jm/diff-context-config'
authorJeff King <peff@peff.net>
Thu, 25 Oct 2012 10:41:57 +0000 (06:41 -0400)
committerJeff King <peff@peff.net>
Thu, 25 Oct 2012 10:41:57 +0000 (06:41 -0400)
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


Trivial merge