xdiff-interface.hon commit Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge() (4c4caaf)
   1#ifndef XDIFF_INTERFACE_H
   2#define XDIFF_INTERFACE_H
   3
   4#include "xdiff/xdiff.h"
   5
   6struct xdiff_emit_state;
   7
   8typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
   9
  10struct xdiff_emit_state {
  11        xdiff_emit_consume_fn consume;
  12        char *remainder;
  13        unsigned long remainder_size;
  14};
  15
  16int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf);
  17int parse_hunk_header(char *line, int len,
  18                      int *ob, int *on,
  19                      int *nb, int *nn);
  20int read_mmfile(mmfile_t *ptr, const char *filename);
  21
  22#endif