[libgit2-glib] Add merge enums

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 8cdba2de6cc9c2bcce9d16950e9574ea28abf4ff
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sun Jun 30 20:56:20 2013 +0200

    Add merge enums

 libgit2-glib/ggit-types.c |    7 +++++++
 libgit2-glib/ggit-types.h |   23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/libgit2-glib/ggit-types.c b/libgit2-glib/ggit-types.c
index 7d9b3ae..86a1215 100644
--- a/libgit2-glib/ggit-types.c
+++ b/libgit2-glib/ggit-types.c
@@ -94,6 +94,13 @@ ASSERT_ENUM (GGIT_FILE_MODE_BLOB_EXECUTABLE, GIT_FILEMODE_BLOB_EXECUTABLE);
 ASSERT_ENUM (GGIT_FILE_MODE_LINK, GIT_FILEMODE_LINK);
 ASSERT_ENUM (GGIT_FILE_MODE_COMMIT, GIT_FILEMODE_COMMIT);
 
+ASSERT_ENUM (GGIT_MERGE_AUTOMERGE_MODE_NORMAL, GIT_MERGE_AUTOMERGE_NORMAL);
+ASSERT_ENUM (GGIT_MERGE_AUTOMERGE_MODE_NONE, GIT_MERGE_AUTOMERGE_NONE);
+ASSERT_ENUM (GGIT_MERGE_AUTOMERGE_MODE_FAVOR_OURS, GIT_MERGE_AUTOMERGE_FAVOR_OURS);
+ASSERT_ENUM (GGIT_MERGE_AUTOMERGE_MODE_FAVOR_THEIRS, GIT_MERGE_AUTOMERGE_FAVOR_THEIRS);
+
+ASSERT_ENUM (GGIT_MERGE_TREE_FIND_RENAMES, GIT_MERGE_TREE_FIND_RENAMES);
+
 ASSERT_ENUM (GGIT_REMOTE_DOWNLOAD_TAGS_AUTO,  GIT_REMOTE_DOWNLOAD_TAGS_AUTO);
 ASSERT_ENUM (GGIT_REMOTE_DOWNLOAD_TAGS_NONE,  GIT_REMOTE_DOWNLOAD_TAGS_NONE);
 ASSERT_ENUM (GGIT_REMOTE_DOWNLOAD_TAGS_ALL,   GIT_REMOTE_DOWNLOAD_TAGS_ALL);
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
index 9a68c21..29d69eb 100644
--- a/libgit2-glib/ggit-types.h
+++ b/libgit2-glib/ggit-types.h
@@ -506,6 +506,29 @@ typedef enum {
        GGIT_FILE_MODE_COMMIT          = 0160000
 } GgitFileMode;
 
+/* NOTE: keep in sync with git2/merge.h */
+/**
+ * GgitMergeAutomergeMode:
+ * @GGIT_MERGE_AUTOMERGE_MODE_NORMAL:
+ * @GGIT_MERGE_AUTOMERGE_MODE_NONE:
+ * @GGIT_MERGE_AUTOMERGE_MODE_FAVOR_OURS:
+ * @GGIT_MERGE_AUTOMERGE_MODE_FAVOR_THEIRS:
+ */
+typedef enum {
+       GGIT_MERGE_AUTOMERGE_MODE_NORMAL       = 0,
+       GGIT_MERGE_AUTOMERGE_MODE_NONE         = 1,
+       GGIT_MERGE_AUTOMERGE_MODE_FAVOR_OURS   = 2,
+       GGIT_MERGE_AUTOMERGE_MODE_FAVOR_THEIRS = 3
+} GgitMergeAutomergeMode;
+
+/**
+ * GgitMergeTreeFlags:
+ * @GIT_MERGE_TREE_FIND_RENAMES: detect renames.
+ */
+typedef enum {
+       GGIT_MERGE_TREE_FIND_RENAMES = (1 << 0)
+} GgitMergeTreeFlags;
+
 /* NOTE: keep in sync with git2/refs.h */
 /**
  * GgitRemoteDownloadTagsType: