Permalink
Cannot retrieve contributors at this time
Name already in use
A tag already exists with the provided branch name. Many Git commands accept both tag and branch names, so creating this branch may cause unexpected behavior. Are you sure you want to create this branch?
git/ll-merge.h
Go to fileThis commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
24 lines (19 sloc)
567 Bytes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/* | |
* Low level 3-way in-core file merge. | |
*/ | |
#ifndef LL_MERGE_H | |
#define LL_MERGE_H | |
struct ll_merge_options { | |
unsigned virtual_ancestor : 1; | |
unsigned variant : 2; /* favor ours, favor theirs, or union merge */ | |
unsigned renormalize : 1; | |
long xdl_opts; | |
}; | |
int ll_merge(mmbuffer_t *result_buf, | |
const char *path, | |
mmfile_t *ancestor, const char *ancestor_label, | |
mmfile_t *ours, const char *our_label, | |
mmfile_t *theirs, const char *their_label, | |
const struct ll_merge_options *opts); | |
int ll_merge_marker_size(const char *path); | |
#endif |