tree 1ca8767031f5f0968d8bc96bb8c2b192b7b94a9b
parent 662384c4996c7bc46322dc6d4f5afafa6e069d40
parent 14937c2c06e63f93f65e1bc6693b95d4e54053d7
author Junio C Hamano <gitster@pobox.com> 1319046553 -0700
committer Junio C Hamano <gitster@pobox.com> 1319046553 -0700

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