X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Git.vala;h=07558991c5dbb8422e652eb4bdbbd4b6cdf1f995;hb=14a44f176a5eac7b296be2b584a24a6f101bacaa;hp=8a53c361f14da8835c1045f7bcde1abfc0662cbe;hpb=1034d5bb5c72fa4da9c23e9a2e9151a2132b0ee5;p=gitlive

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();