From: Fredrik Kuivinen <freku045@student.liu.se>
Date: Sun, 20 Nov 2005 12:14:37 +0000 (+0100)
Subject: merge-recursive: Replace 'except:'
X-Git-Tag: v0.99.9k^2~48
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a6322d079b1d2e2cb72da1271171b35a173f3d22?hp=a6322d079b1d2e2cb72da1271171b35a173f3d22

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>
---