Git.vala

[gitlive] / Git.vala

diff --git a/Git.vala b/Git.vala
index 0ba9e3d..f28f54a 100644 (file)
--- a/Git.vala
+++ b/Git.vala
@@ -160,7 +160,7 @@ namespace  GitLive {
                        // let's try a merge..
                        var mo = new Ggit.MergeOptions();
                        mo.set_file_favor(Ggit.MergeFileFavor.THEIRS);
-                       var ix = this.repo.merge_trees(master_tree, master_tree, head_tree, mo);
+                       var ix = this.repo.merge_trees(null, master_tree, head_tree, mo);
                        
                        if (ix.has_conflicts()) {
                                GLib.debug("merge has conflicts");