X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=MergeBranch.vala;h=747117cd6ca987cf29e15502d640f3216dee3c64;hp=258736298ba5e5559f8c32fe6318dc24df4f385e;hb=f582f1a378d7dd4fa23a40c5f17c4279d343552a;hpb=93a57df7ad5ac5a4dcdc614b9e765186e8f98669

diff --git a/MergeBranch.vala b/MergeBranch.vala
index 25873629..747117cd 100644
--- 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();