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

Git.vala
---

diff --git a/Git.vala b/Git.vala
index 8a53c361..07558991 100644
--- a/Git.vala
+++ b/Git.vala
@@ -211,6 +211,7 @@ namespace  GitLive {
 			var mo = new Ggit.MergeOptions();
 			mo.set_file_favor(Ggit.MergeFileFavor.THEIRS);
 			var ix  = this.repo.merge_trees(anc_tree, master_tree, head_tree, mo);
+			ix.write();
 			 var treeoid = ix.write_tree();