[libgit2-glib] Bind GgitMergeFileFlags

[Jesse van den Kieboom <jessevdk src gnome org>]

commit cbf01d74c0d35cea4e29aa446fbe4cd23a78ae5c
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Mon Aug 10 01:18:38 2015 +0200

    Bind GgitMergeFileFlags

 libgit2-glib/ggit-types.c |   10 ++++++++++
 libgit2-glib/ggit-types.h |   24 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 0 deletions(-)
---
diff --git a/libgit2-glib/ggit-types.c b/libgit2-glib/ggit-types.c
index f676299..11c504a 100644
--- a/libgit2-glib/ggit-types.c
+++ b/libgit2-glib/ggit-types.c
@@ -293,4 +293,14 @@ ASSERT_ENUM (GGIT_CLONE_LOCAL_LOCAL, GIT_CLONE_LOCAL);
 ASSERT_ENUM (GGIT_CLONE_LOCAL_NO_LOCAL, GIT_CLONE_NO_LOCAL);
 ASSERT_ENUM (GGIT_CLONE_LOCAL_NO_LINKS, GIT_CLONE_LOCAL_NO_LINKS);
 
+ASSERT_ENUM (GGIT_MERGE_FILE_DEFAULT, GIT_MERGE_FILE_DEFAULT);
+ASSERT_ENUM (GGIT_MERGE_FILE_STYLE_MERGE, GIT_MERGE_FILE_STYLE_MERGE);
+ASSERT_ENUM (GGIT_MERGE_FILE_STYLE_DIFF3, GIT_MERGE_FILE_STYLE_DIFF3);
+ASSERT_ENUM (GGIT_MERGE_FILE_SIMPLIFY_ALNUM, GIT_MERGE_FILE_SIMPLIFY_ALNUM);
+ASSERT_ENUM (GGIT_MERGE_FILE_IGNORE_WHITESPACE, GIT_MERGE_FILE_IGNORE_WHITESPACE);
+ASSERT_ENUM (GGIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE, GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE);
+ASSERT_ENUM (GGIT_MERGE_FILE_IGNORE_WHITESPACE_EOL, GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL);
+ASSERT_ENUM (GGIT_MERGE_FILE_DIFF_PATIENCE, GIT_MERGE_FILE_DIFF_PATIENCE);
+ASSERT_ENUM (GGIT_MERGE_FILE_DIFF_MINIMAL, GIT_MERGE_FILE_DIFF_MINIMAL);
+
 /* ex:set ts=8 noet: */
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
index 98789c6..9061e1f 100644
--- a/libgit2-glib/ggit-types.h
+++ b/libgit2-glib/ggit-types.h
@@ -548,6 +548,30 @@ typedef enum {
 } GgitMergeFileFavor;
 
 /**
+ * GgitMergeFileFlags:
+ * GGIT_MERGE_FILE_DEFAULT: Defaults.
+ * GGIT_MERGE_FILE_STYLE_MERGE: Create standard conflicted merge files.
+ * GGIT_MERGE_FILE_STYLE_DIFF3: Create diff3-style files.
+ * GGIT_MERGE_FILE_SIMPLIFY_ALNUM: Condense non-alphanumeric regions for simplified diff file.
+ * GGIT_MERGE_FILE_IGNORE_WHITESPACE: Ignore all whitespace.
+ * GGIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE: Ignore changes in amount of whitespace.
+ * GGIT_MERGE_FILE_IGNORE_WHITESPACE_EOL: Ignore whitespace at end of line.
+ * GGIT_MERGE_FILE_DIFF_PATIENCE: Use the "patience diff" algorithm.
+ * GGIT_MERGE_FILE_DIFF_MINIMAL: Take extra time to find minimal diff.
+ */
+typedef enum {
+       GGIT_MERGE_FILE_DEFAULT                  = 0,
+       GGIT_MERGE_FILE_STYLE_MERGE              = (1 << 0),
+       GGIT_MERGE_FILE_STYLE_DIFF3              = (1 << 1),
+       GGIT_MERGE_FILE_SIMPLIFY_ALNUM           = (1 << 2),
+       GGIT_MERGE_FILE_IGNORE_WHITESPACE        = (1 << 3),
+       GGIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE = (1 << 4),
+       GGIT_MERGE_FILE_IGNORE_WHITESPACE_EOL    = (1 << 5),
+       GGIT_MERGE_FILE_DIFF_PATIENCE            = (1 << 6),
+       GGIT_MERGE_FILE_DIFF_MINIMAL             = (1 << 7),
+} GgitMergeFileFlags;
+
+/**
  * GgitMergeTreeFlags:
  * @GGIT_MERGE_TREE_FIND_RENAMES: detect renames.
  */