diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/git2/merge.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index 1888babd1..c079ef9c2 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -38,14 +38,11 @@ typedef enum { /* Produce a conflict in a file when two similar regions are changed. */ GIT_MERGE_FILE_FAVOR_NORMAL = 0, - /* Do not attempt to produce an automerged file during tree merge. */ - GIT_MERGE_FILE_FAVOR_NO_MERGE = 1, - /* Produce a file containing the "ours" side of conflicting regions. */ - GIT_MERGE_FILE_FAVOR_OURS = 2, + GIT_MERGE_FILE_FAVOR_OURS = 1, /* Produce a file containing the "theirs" side of conflicting regions. */ - GIT_MERGE_FILE_FAVOR_THEIRS = 3, + GIT_MERGE_FILE_FAVOR_THEIRS = 2, } git_merge_file_favor_t; |