diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-01-19 22:36:50 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-01-20 17:15:15 -0500 |
| commit | db3462ce7714e2a6ce23130a7046a77860739e05 (patch) | |
| tree | 73559dd90861c5bbb2ea81ad6be9da9d3756dba6 /include/git2/merge.h | |
| parent | 0e1ba46cfbca0eec00d8af713fc2059158685381 (diff) | |
| download | libgit2-db3462ce7714e2a6ce23130a7046a77860739e05.tar.gz | |
Support union merges
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; |