Merge branch 'rs/blame'
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 Nov 2008 00:05:39 +0000 (16:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Nov 2008 00:05:39 +0000 (16:05 -0800)
* rs/blame:
  blame: use xdi_diff_hunks(), get rid of struct patch
  add xdi_diff_hunks() for callers that only need hunk lengths
  Allow alternate "low-level" emit function from xdl_diff
  Always initialize xpparam_t to 0
  blame: inline get_patch()

1  2 
builtin-blame.c
diff.c
xdiff-interface.c

diff --cc builtin-blame.c
Simple merge
diff --cc diff.c
Simple merge
Simple merge