[libgit2-glib] Synchronize merge options in cherry pick options

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

commit d94a2f8d5f964591025d01d862b34646617a787c
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Sat Aug 22 13:52:04 2015 +0200

    Synchronize merge options in cherry pick options

 libgit2-glib/ggit-cherry-pick-options.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/libgit2-glib/ggit-cherry-pick-options.c b/libgit2-glib/ggit-cherry-pick-options.c
index 7c475cb..53e03c6 100644
--- a/libgit2-glib/ggit-cherry-pick-options.c
+++ b/libgit2-glib/ggit-cherry-pick-options.c
@@ -200,6 +200,13 @@ _ggit_cherry_pick_options_get_cherry_pick_options (GgitCherryPickOptions *option
                                *_ggit_checkout_options_get_checkout_options (priv->checkout_options);
                }
 
+               // Make sure to synchronize the wrapped merge options with the internal merge options
+               if (priv->merge_options)
+               {
+                       priv->options.merge_opts =
+                               *_ggit_merge_options_get_merge_options (priv->merge_options);
+               }
+
                return &priv->options;
        }
        else