summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modifyBox.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/modifyBox.go b/modifyBox.go
index 4490514..42b26b0 100644
--- a/modifyBox.go
+++ b/modifyBox.go
@@ -47,7 +47,7 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) {
label := "merge " + rs.userWorkingName.String() + " to " + rs.develWorkingName.String()
rs.develMergeB = newgrid.NewButton(label, func() {
rs.Disable()
- if result, err := rs.pb.MergeUserToDevel(); err == nil {
+ if result, err := rs.pb.MergeToDevel(); err == nil {
log.Warn("THINGS SEEM OK fullAutomation() returned true.")
} else {
log.Warn("THINGS FAILED fullAutomation() returned false", result.Error)