From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 May 2012 22:22:13 +0000 (-0700)
Subject: Merge branch 'rs/xdiff-lose-emit-func'
X-Git-Tag: v1.7.11-rc0~24
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2e464dd5b220d4d2d8a16d5c43efe7af3c9adda9;p=git.git

Merge branch 'rs/xdiff-lose-emit-func'

Simplifies the interface between the implementation of "blame" and
underlying xdiff engine, and removes a lot of unused or unnecessary code
from the latter.

By René Scharfe (6) and Ramsay Jones (1)
* rs/xdiff-lose-emit-func:
  builtin/blame.c: Fix a "Using plain integer as NULL pointer" warning
  xdiff: remove unused functions
  xdiff: remove emit_func() and xdi_diff_hunks()
  blame: factor out helper for calling xdi_diff()
  blame: use hunk_func(), part 2
  blame: use hunk_func(), part 1
  xdiff: add hunk_func()
---

2e464dd5b220d4d2d8a16d5c43efe7af3c9adda9