Documentation / technical / api-xdiff-interface.txton commit Merge branch 'da/mergetool-delete-delete-conflict' into maint (517736f)
   1xdiff interface API
   2===================
   3
   4Talk about our calling convention to xdiff library, including
   5xdiff_emit_consume_fn.
   6
   7(Dscho, JC)