MergeBranch.bjs

[gitlive] / MergeBranch.vala

diff --git a/MergeBranch.vala b/MergeBranch.vala
index 2587362..747117c 100644 (file)
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -144,7 +144,7 @@ public class MergeBranch : Object
         
        
        Timeout.add_seconds(1, () => {
-               
+           _this.diff_view.el.get_buffer().set_text(repo.previewMerge());              
                // if we are not working on a ticket, then we should be able to pick one?
                _this.dbmodel.loadTickets();
                _this.actionmodel.loadActions();