[libgit2-glib] types: fix asserts for GgitMergeFlags

[Ignacio Casal Quinteiro <icq src gnome org>]

commit d60477618023c46d142f58af635ffdc4328858bc
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Tue Mar 15 00:00:52 2016 +0100

    types: fix asserts for GgitMergeFlags

 libgit2-glib/ggit-types.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/libgit2-glib/ggit-types.c b/libgit2-glib/ggit-types.c
index 35071c1..d4d9b49 100644
--- a/libgit2-glib/ggit-types.c
+++ b/libgit2-glib/ggit-types.c
@@ -123,7 +123,10 @@ ASSERT_ENUM (GGIT_MERGE_FILE_FAVOR_OURS, GIT_MERGE_FILE_FAVOR_OURS);
 ASSERT_ENUM (GGIT_MERGE_FILE_FAVOR_THEIRS, GIT_MERGE_FILE_FAVOR_THEIRS);
 ASSERT_ENUM (GGIT_MERGE_FILE_FAVOR_UNION, GIT_MERGE_FILE_FAVOR_UNION);
 
-ASSERT_ENUM (GGIT_MERGE_TREE_FIND_RENAMES, GIT_MERGE_TREE_FIND_RENAMES);
+ASSERT_ENUM (GGIT_MERGE_FIND_RENAMES, GIT_MERGE_FIND_RENAMES);
+ASSERT_ENUM (GGIT_MERGE_FAIL_ON_CONFLICT, GIT_MERGE_FAIL_ON_CONFLICT);
+ASSERT_ENUM (GGIT_MERGE_SKIP_REUC, GIT_MERGE_SKIP_REUC);
+ASSERT_ENUM (GGIT_MERGE_NO_RECURSIVE, GIT_MERGE_NO_RECURSIVE);
 
 ASSERT_ENUM (GGIT_REBASE_OPERATION_PICK, GIT_REBASE_OPERATION_PICK);
 ASSERT_ENUM (GGIT_REBASE_OPERATION_REWORD, GIT_REBASE_OPERATION_REWORD);