projects
/
gitlive
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Git.vala
[gitlive]
/
Git.vala
diff --git
a/Git.vala
b/Git.vala
index
8a53c36
..
0755899
100644
(file)
--- 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();