From f68d2d3719c508eea4ed526f7a32a4f66c5814c2 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 21 Mar 2019 16:45:42 +0800 Subject: [PATCH] Git.vala --- Git.vala | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Git.vala b/Git.vala index 63c03c7e..d7a9afff 100644 --- a/Git.vala +++ b/Git.vala @@ -220,6 +220,13 @@ namespace GitLive { } + + public void diffhead() + { + + } + + public void mergeMasterIntoHead() { // assumes head is not master... @@ -272,6 +279,9 @@ namespace GitLive { } + + + /* public bool doMergeClose(string commit_message) { -- 2.39.2