Documentation / technical / api-xdiff-interface.txton commit Docs: Add -X option to git-merge's synopsis. (adda3c3)
   1xdiff interface API
   2===================
   3
   4Talk about our calling convention to xdiff library, including
   5xdiff_emit_consume_fn.
   6
   7(Dscho, JC)