ll-merge.h

   1 /*
   2  * Low level 3-way in-core file merge.
   3  */
   4
   5 #ifndef LL_MERGE_H
   6 #define LL_MERGE_H
   7
   8 #include "xdiff/xdiff.h"
   9
  10 struct ll_merge_options {
  11         unsigned virtual_ancestor : 1;
  12         unsigned variant : 2;   /* favor ours, favor theirs, or union merge */
  13         unsigned renormalize : 1;
  14         long xdl_opts;
  15 };
  16
  17 int ll_merge(mmbuffer_t *result_buf,
  18              const char *path,
  19              mmfile_t *ancestor, const char *ancestor_label,
  20              mmfile_t *ours, const char *our_label,
  21              mmfile_t *theirs, const char *their_label,
  22              const struct ll_merge_options *opts);
  23
  24 int ll_merge_marker_size(const char *path);
  25
  26 #endif