diff options
Diffstat (limited to 'src/merge_file.h')
| -rw-r--r-- | src/merge_file.h | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/merge_file.h b/src/merge_file.h index 0af2f0a57..332be490b 100644 --- a/src/merge_file.h +++ b/src/merge_file.h @@ -34,6 +34,27 @@ typedef struct { #define GIT_MERGE_FILE_RESULT_INIT {0} +typedef enum { + /* Condense non-alphanumeric regions for simplified diff file */ + GIT_MERGE_FILE_SIMPLIFY_ALNUM = (1 << 0), +} git_merge_file_flags_t; + +typedef enum { + /* Create standard conflicted merge files */ + GIT_MERGE_FILE_STYLE_MERGE = 0, + + /* Create diff3-style files */ + GIT_MERGE_FILE_STYLE_DIFF3 = 1, +} git_merge_file_style_t; + +typedef struct { + git_merge_file_favor_t favor; + git_merge_file_flags_t flags; + git_merge_file_style_t style; +} git_merge_file_options; + +#define GIT_MERGE_FILE_OPTIONS_INIT {0} + int git_merge_file_input_from_index_entry( git_merge_file_input *input, git_repository *repo, @@ -49,7 +70,7 @@ int git_merge_files( git_merge_file_input *ancestor, git_merge_file_input *ours, git_merge_file_input *theirs, - git_merge_automerge_flags flags); + git_merge_file_options *opts); GIT_INLINE(void) git_merge_file_input_free(git_merge_file_input *input) { |