Documentation / technical / api-xdiff-interface.txton commit Documentation/merge-options.txt: order options in alphabetical groups (7c85d27)
   1xdiff interface API
   2===================
   3
   4Talk about our calling convention to xdiff library, including
   5xdiff_emit_consume_fn.
   6
   7(Dscho, JC)