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 #define LL_OPT_VIRTUAL_ANCESTOR (1 << 0)
   9 #define LL_OPT_FAVOR_MASK       ((1 << 1) | (1 << 2))
  10 #define LL_OPT_FAVOR_SHIFT 1
  11 #define LL_OPT_RENORMALIZE      (1 << 3)
  12
  13 static inline int ll_opt_favor(int flag)
  14 {
  15         return (flag & LL_OPT_FAVOR_MASK) >> LL_OPT_FAVOR_SHIFT;
  16 }
  17
  18 static inline int create_ll_flag(int favor)
  19 {
  20         return ((favor << LL_OPT_FAVOR_SHIFT) & LL_OPT_FAVOR_MASK);
  21 }
  22
  23 int ll_merge(mmbuffer_t *result_buf,
  24              const char *path,
  25              mmfile_t *ancestor, const char *ancestor_label,
  26              mmfile_t *ours, const char *our_label,
  27              mmfile_t *theirs, const char *their_label,
  28              int flag);
  29
  30 int ll_merge_marker_size(const char *path);
  31
  32 #endif