THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Git Source Code Mirror - This is a publish-only repository and all pull requests are ignored. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
git
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

32 lines
740B

  1. /*
  2. * Low level 3-way in-core file merge.
  3. */
  4. #ifndef LL_MERGE_H
  5. #define LL_MERGE_H
  6. #include "xdiff/xdiff.h"
  7. struct index_state;
  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. unsigned extra_marker_size;
  13. long xdl_opts;
  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. struct index_state *istate,
  21. const struct ll_merge_options *opts);
  22. int ll_merge_marker_size(struct index_state *istate, const char *path);
  23. void reset_merge_attributes(void);
  24. #endif