Merge branch 'rs/diff-whole-function'
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 17:49:13 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 17:49:13 +0000 (10:49 -0700)
commit9b55aa03daebf43067021b7d58abea249229987b
tree1ca8767031f5f0968d8bc96bb8c2b192b7b94a9b
parent662384c4996c7bc46322dc6d4f5afafa6e069d40
parent14937c2c06e63f93f65e1bc6693b95d4e54053d7
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()
Documentation/diff-options.txt
diff.c