From: Junio C Hamano 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.lorimer.id.au/gitweb.git/diff_plain/9b55aa03daebf43067021b7d58abea249229987b?ds=inline;hp=--cc 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