diff options
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index c079ef9c2..ad9b5e2ea 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -43,6 +43,9 @@ typedef enum { /* Produce a file containing the "theirs" side of conflicting regions. */ GIT_MERGE_FILE_FAVOR_THEIRS = 2, + + /* Produce a file blending the sides in a union of conflicting regions */ + GIT_MERGE_FILE_FAVOR_UNION = 3, } git_merge_file_favor_t; |