From 0e1ba46cfbca0eec00d8af713fc2059158685381 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Sun, 19 Jan 2014 20:03:13 -0800 Subject: Remove the "merge none" flag The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed. --- include/git2/merge.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'include/git2/merge.h') 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; -- cgit v1.2.1