projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
06f393e
)
Git.vala
author
Alan Knowles
<alan@roojs.com>
Fri, 15 Mar 2019 02:06:21 +0000
(10:06 +0800)
committer
Alan Knowles
<alan@roojs.com>
Fri, 15 Mar 2019 02:06:21 +0000
(10:06 +0800)
Git.vala
patch
|
blob
|
history
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");