am --skip: revert changes introduced by failed 3way merge

[git] / Documentation / technical / api-xdiff-interface.txt

xdiff interface API
===================

Talk about our calling convention to xdiff library, including
xdiff_emit_consume_fn.

(Dscho, JC)