Git.vala

diff --git a/Git.vala b/Git.vala
index b219be4..ad74d26 100644 (file)
--- 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();