[libgit2-glib] Bind ggit_entry_is_conflict

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

commit d91ef280691deaaa0d2630ad13737b8d5a9583c9
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Thu Aug 13 21:57:48 2015 +0200

    Bind ggit_entry_is_conflict

 libgit2-glib/ggit-index-entry.c |   17 +++++++++++++++++
 libgit2-glib/ggit-index-entry.h |    2 ++
 2 files changed, 19 insertions(+), 0 deletions(-)
---
diff --git a/libgit2-glib/ggit-index-entry.c b/libgit2-glib/ggit-index-entry.c
index f0cf00b..eeb40f8 100644
--- a/libgit2-glib/ggit-index-entry.c
+++ b/libgit2-glib/ggit-index-entry.c
@@ -812,6 +812,23 @@ ggit_index_entry_set_commit (GgitIndexEntry    *entry,
        g_object_unref (sig);
 }
 
+/**
+ * ggit_index_entry_is_conflict:
+ * @entry: a #GgitIndexEntry.
+ *
+ * Get whether the entry represents a conflict.
+ *
+ * Returns: %TRUE if the entry is a conflict, or %FALSE otherwise.
+ *
+ **/
+gboolean
+ggit_index_entry_is_conflict (GgitIndexEntry *entry)
+{
+       g_return_if_fail (entry != NULL);
+
+       return git_index_entry_is_conflict (entry->entry);
+}
+
 const git_index_entry *
 _ggit_index_entry_get_native (GgitIndexEntry *entry)
 {
diff --git a/libgit2-glib/ggit-index-entry.h b/libgit2-glib/ggit-index-entry.h
index ac40a65..57b81b4 100644
--- a/libgit2-glib/ggit-index-entry.h
+++ b/libgit2-glib/ggit-index-entry.h
@@ -105,6 +105,8 @@ gboolean          ggit_index_entry_stat               (GgitIndexEntry    *entry,
 void              ggit_index_entry_set_commit         (GgitIndexEntry    *entry,
                                                        GgitCommit        *commit);
 
+gboolean          ggit_index_entry_is_conflict        (GgitIndexEntry    *entry);
+
 const git_index_entry
                  *_ggit_index_entry_get_native        (GgitIndexEntry    *entry);