X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RepoStatusPopover.vala;h=5f0b2577b7579071feb307042f6fa198f7cb065d;hb=267f1afc73bb376451b5ec8f0014f878f472d740;hp=f7ee0b285f54860f616c6d59340d64dda9e6a995;hpb=62156312e47d7aa26cd02f40d6166b687abaed73;p=gitlive

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index f7ee0b28..5f0b2577 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -581,20 +581,16 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Merge ticket";
+            this.el.label = "Merge branch/  ticket";
 
             //listeners
             this.el.button_press_event.connect( () => {
-               _this.repo.git({ "commit" , "-a" ,"-m", "Uncommited changes synced" });
-               _this.repo.push();
-               _this.repo.loadStatus();
-               
-                _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);
-                _this.status_view.el.get_buffer().set_text(_this.repo.git_status);
-                
+            
                _this.el.hide();
-               Clones.singleton().reposStore.load();
-               
+               Clones.singleton().el.response(-1);
+               if (this.repo.activeTicket) {
+            	   MergeBranch.singleton().show(this.repo.activeTicket, null);   
+               }
                 return false;
             });
         }