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 struct ll_merge_options {
   9         unsigned virtual_ancestor : 1;
  10         unsigned variant : 2;   /* favor ours, favor theirs, or union merge */
  11         unsigned renormalize : 1;
  12         long xdl_opts;
  13 };
  14
  15 int ll_merge(mmbuffer_t *result_buf,
  16              const char *path,
  17              mmfile_t *ancestor, const char *ancestor_label,
  18              mmfile_t *ours, const char *our_label,
  19              mmfile_t *theirs, const char *their_label,
  20              const struct ll_merge_options *opts);
  21
  22 int ll_merge_marker_size(const char *path);
  23
  24 #endif