Andrew's git / gitweb.git / Documentation/technical/api-xdiff-interface.txt
?
Documentation / technical / api-xdiff-interface.txton commit merge-recursive: check for file level conflicts then get new name (f6f7755)
   1xdiff interface API
   2===================
   3
   4Talk about our calling convention to xdiff library, including
   5xdiff_emit_consume_fn.
   6
   7(Dscho, JC)