From: Alan Knowles <alan@roojs.com>
Date: Fri, 15 Mar 2019 02:12:06 +0000 (+0800)
Subject: Git.vala
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=0888f9319f08022441e873a6f637dda458108f95

Git.vala
---

diff --git a/Git.vala b/Git.vala
index f28f54ae..0ba9e3d4 100644
--- 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(null, master_tree, head_tree, mo);
+			var ix = this.repo.merge_trees(master_tree, master_tree, head_tree, mo);
 			
 			if (ix.has_conflicts()) {
 				GLib.debug("merge has conflicts");