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

Git.vala
---

diff --git a/Git.vala b/Git.vala
index b219be4e..ad74d269 100644
--- a/Git.vala
+++ b/Git.vala
@@ -20,7 +20,8 @@ void main()
 	Ggit.init();
 	
 	var a = new GitLive.Repo("/home/alan/gitlive/gitlive");
-	a.walkDiff();
+	a.mergeMasterIntoHead();
+	//a.walkDiff();
 	return;
 	a.is_managed();
 	a.is_autocommit();