Changed GitRepo.vala

diff --git a/GitRepo.vala b/GitRepo.vala
index 91feb4c..7cd755d 100644 (file)
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -565,6 +565,23 @@ public class GitRepo : Object
                        return true;
      
      }
                        return true;
      
      }

+     
+     public string previewMerge()
+     {
+        try {                                  
+                       var lines = this.git({"log", "master...",  "--pretty=format:\"%H %P\"" }).split("\n");;
+                       var head = this.git({"log", "-1",  "--pretty=format:\"%H %P\"" });
+                       var last = lines[lines.length-1];
+                       var start = head.split(" ")[0];
+                       var end = last.split(" ")[1];
+                       return this.git({ "diff" , start+".."+end, "--no-color" });
+               }  catch(Error ee) {
+                       GitMonitor.gitmonitor.pauseError(ee.message);
+                       return "Error getting diff";            
+               }
+        
+     
+     }