| commit | 1eeb893326c318aa7e683d17a87f127c848d06ca | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 11 May 2012 21:09:30 +0000 (11 14:09 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 11 May 2012 21:09:30 +0000 (11 14:09 -0700) | ||
| tree | 1bf588294a53c7cc5f10bb05d746d7555cebef86 | treesnapshot (tar.gz zip) |
| parent | 0033e5ff8a9c974bbea6aa7b3eeb1c1d7f992d48 | commitdiff |
| parent | be89977543c7798411f336236a506bf07b0a3d71 | commitdiff |
Merge branch 'rs/xdiff-lose-emit-func' into next
Simplifies the interface between the implementation of "blame" and
underlying xdiff engine, and removes a lot of unnecessary code from
the latter.
By René Scharfe
* rs/xdiff-lose-emit-func:
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()
Simplifies the interface between the implementation of "blame" and
underlying xdiff engine, and removes a lot of unnecessary code from
the latter.
By René Scharfe
* rs/xdiff-lose-emit-func:
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()