From d0752119848004ffcc0bc1f602de146b7c20dd15 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Fri, 30 Nov 2012 09:56:51 +0000
Subject: Merge is local doesn't make sense to retry

---
diff --git a/devbot/git.py b/devbot/git.py
index b3f3594..e0519da 100644
--- a/devbot/git.py
+++ b/devbot/git.py
@@ -40,8 +40,7 @@ class Module:
             command.run(["git", "checkout", self.tag])
         else:
             command.run(["git", "merge", "--ff-only",
-                         "origin/%s" % self._branch],
-                        retry=self._retry)
+                         "origin/%s" % self._branch])
 
     def clean(self):
         try:
--
cgit v0.9.1