aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-merge-recursive.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 37258ad77..012923355 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):