X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-recursive.py;h=01292335509bfd1460e12e0e1d86c4fcd1f265a4;hb=a6322d079b1d2e2cb72da1271171b35a173f3d22;hp=37258ad77481fb0edaf2b084b7be173d8da8c586;hpb=9ae2172aed289f2706a0e88288909fa47eddd7e7;p=git.git

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 37258ad7..01292335 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -245,7 +245,7 @@ def updateFileExt(sha, mode, path, updateCache, updateWd):
 
             try:
                 createDir = not stat.S_ISDIR(os.lstat(p).st_mode)
-            except: 
+            except OSError:
                 createDir = True
             
             if createDir:
@@ -295,7 +295,7 @@ def removeFile(clean, path):
                 raise
         try:
             os.removedirs(os.path.dirname(path))
-        except:
+        except OSError:
             pass
 
 def uniquePath(path, branch):