From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Oct 2011 17:49:13 +0000 (-0700)
Subject: Merge branch 'rs/diff-whole-function'
X-Git-Tag: v1.7.8-rc0~37
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9b55aa03daebf43067021b7d58abea249229987b;p=git.git

Merge branch 'rs/diff-whole-function'

* rs/diff-whole-function:
  diff: add option to show whole functions as context
  xdiff: factor out get_func_line()
---

9b55aa03daebf43067021b7d58abea249229987b