diff options
Diffstat (limited to 'windowRepos.go')
| -rw-r--r-- | windowRepos.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/windowRepos.go b/windowRepos.go index 824e222..563711f 100644 --- a/windowRepos.go +++ b/windowRepos.go @@ -89,7 +89,7 @@ func (r *repoWindow) repoMenu() *gui.Node { log.Info("filter dirty =", dirty.Checked()) } - box2.NewButton("merge it all", func() { + box2.NewButton("merge user to devel", func() { r.Disable() if IsAnythingDirty() { log.Info("You can't apply patches when repos are dirty") @@ -99,9 +99,11 @@ func (r *repoWindow) repoMenu() *gui.Node { if !r.mergeAllUserToDevel() { return } + /* no longer do this here! yay! long live forge if !r.mergeAllDevelToMain() { return } + */ r.Enable() }) |