From: Alan Knowles <alan@roojs.com>
Date: Wed, 19 Dec 2018 04:56:31 +0000 (+0800)
Subject: RepoStatusPopover.bjs
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=54dd675963bf0ad41f2d8ba1728467647e4ec3e2

RepoStatusPopover.bjs
RepoStatusPopover.vala
---

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index 72d280e0..28724df3 100644
--- a/RepoStatusPopover.bjs
+++ b/RepoStatusPopover.bjs
@@ -150,7 +150,7 @@
          "listeners" : {
           "button_press_event" : "() => {\n   _this.repo.git({ \"commit\" , \"-a\" ,\"-m\", \"Uncommited changes synced\" });\n   _this.repo.push();\n   _this.repo.loadStatus();\n   \n    _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n    _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n    \n   _this.el.hide();\n   Clones.singleton().reposStore.load();\n   \n    return false;\n}"
          },
-         "label" : "Commit Changes",
+         "label" : "Merge to master",
          "xtype" : "Button",
          "* pack" : "add",
          "$ xns" : "Gtk"
diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index b53c2e29..b225b1e9 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -581,7 +581,7 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Commit Changes";
+            this.el.label = "Merge to master";
 
             //listeners
             this.el.button_press_event.connect( () => {