merge-recursive: Replace 'except:'
commita6322d079b1d2e2cb72da1271171b35a173f3d22
authorFredrik Kuivinen <freku045@student.liu.se>
Sun, 20 Nov 2005 12:14:37 +0000 (20 13:14 +0100)
committerJunio C Hamano <junkio@cox.net>
Sun, 20 Nov 2005 18:47:16 +0000 (20 10:47 -0800)
tree0c703eb3880645a218de511c43640ea1fcd732be
parent9ae2172aed289f2706a0e88288909fa47eddd7e7
merge-recursive: Replace 'except:'

Plain except:s are evil as they will catch all kinds of exceptions
including NameError and AttrubiteError.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-recursive.py