From: Alan Knowles <alan@roojs.com>
Date: Wed, 20 Mar 2019 06:58:08 +0000 (+0800)
Subject: Git.vala
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=6ded00a61d4e060f661d277ff993524b4765691c

Git.vala
---

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