MergeBranch.bjs

[gitlive] / MergeBranch.vala

diff --git a/MergeBranch.vala b/MergeBranch.vala
index 9b2b594..20fbc53 100644 (file)
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -142,7 +142,9 @@ public class MergeBranch : Object
         
        
        Timeout.add_seconds(1, () => {
-           _this.diff_view.el.get_buffer().set_text(repo.previewMerge());              
+           _this.diff_view.el.get_buffer().set_text(
+               repo != null ? repo.previewMerge() : GitRepo.previewMerges(ticket.id)
+               );              
                // if we are not working on a ticket, then we should be able to pick one?
                _this.dbmodel.loadTickets();
                _this.actionmodel.loadActions();