From 6855a599e4faa534e0ce24215519d6099c744b57 Mon Sep 17 00:00:00 2001
From: Victor Garcia <bravejolie@gmail.com>
Date: Wed, 4 Dec 2013 23:49:26 +0100
Subject: [PATCH] implementing merge with default options - minor change

---
 src/mergeresult.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mergeresult.c b/src/mergeresult.c
index c0ffddd..dfad78b 100644
--- a/src/mergeresult.c
+++ b/src/mergeresult.c
@@ -90,7 +90,7 @@ PyDoc_STRVAR(MergeResult_fastforward_oid__doc__, "Fastforward Oid");
 PyObject *
 MergeResult_fastforward_oid__get__(MergeResult *self)
 {
-    if (self->is_fastforward == 1)
+    if (self->is_fastforward)
     {
         Py_INCREF(self->fastforward_oid);
         return self->fastforward_oid;
@@ -123,7 +123,7 @@ PyTypeObject MergeResultType = {
     "_pygit2.MergeResult",                     /* tp_name           */
     sizeof(MergeResult),                       /* tp_basicsize      */
     0,                                         /* tp_itemsize       */
-    0,                                          /* tp_dealloc        */
+    0,                                         /* tp_dealloc        */
     0,                                         /* tp_print          */
     0,                                         /* tp_getattr        */
     0,                                         /* tp_setattr        */