From: Alan Knowles <alan@roojs.com>
Date: Mon, 5 Nov 2018 08:05:32 +0000 (+0800)
Subject: sync with changes
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=ecaffc9070026df0af77c7b5d12a7facb6d479c7

sync with changes
---

diff --git a/GitRepo.vala b/GitRepo.vala
index 034d535c..df1345bc 100644
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -370,7 +370,7 @@ public class GitRepo : Object
 					   if (branchname != "master") {
 					       string[] cmd = { "merge", "master"  };
 						    this.git(cmd);
-			  		       cmd = { "commit",   "-a" , "-m",  commit_message };
+			  		       cmd = { "commit",   "-a" , "-m",  "merge master changes" };
 			               this.git( cmd );
 					    }
 				   } catch(Error e) {