X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=GitRepo.vala;h=191631157518be538c3ebc9ad5022e23a35142b1;hp=77a56f2fcf5bd1111ff05857a0cd00e94453c0f4;hb=8089012135384a912df88ab0257554520a4b06f8;hpb=beb0b87544a81660c3e886c1130306bb54efb2cd

diff --git a/GitRepo.vala b/GitRepo.vala
index 77a56f2f..19163115 100644
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -347,6 +347,7 @@ public class GitRepo : Object
     	return true;
     }
     
+    
     public bool createBranchNamed(string branchname)
     { 	
 		
@@ -374,7 +375,7 @@ public class GitRepo : Object
 					    this.git(cmd);
 				   } catch(Error e) {
 					   	try {
-	   					    string[] cmd = { "mergetool" };
+	   					    string[] cmd = { "mergetool" , "--no-prompt" }; 
 							this.git(cmd);
 	   					    cmd = { "commit",  "-m" , "Fix merge conflicts from master" };
 							this.git(cmd);
@@ -398,7 +399,7 @@ public class GitRepo : Object
 				        string[] cmd = { "checkout", "-b" , branchname  };
 				        this.git(cmd);
 				        
-                       this.push();				        
+                       this.push();	
 				        } catch(Error ee) {
 				 		GitMonitor.gitmonitor.pauseError(ee.message);
 				 		return false;