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

Junio C Hamano committed Oct 19, 2011 at 10:49 UTC 9b55aa03daebf43067021b7d58abea249229987b

No changes.