diff options
Diffstat (limited to 'modifyBox.go')
| -rw-r--r-- | modifyBox.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modifyBox.go b/modifyBox.go index d49f967..502727f 100644 --- a/modifyBox.go +++ b/modifyBox.go @@ -61,7 +61,7 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) { label = "merge " + rs.develWorkingName.String() + " to " + rs.mainWorkingName.String() rs.mainMergeB = newgrid.NewButton(label, func() { rs.Disable() - if rs.MergeUserToDevel() { + if rs.MergeDevelToMaster() { log.Warn("THINGS SEEM OK fullAutomation() returned true.") } else { log.Warn("THINGS FAILED fullAutomation() returned false") |