Documentation / technical / api-xdiff-interface.txton commit Teach git-pull to pass -X<option> to git-merge (ee2c795)
   1xdiff interface API
   2===================
   3
   4Talk about our calling convention to xdiff library, including
   5xdiff_emit_consume_fn.
   6
   7(Dscho, JC)