py-cvs merge, better error dialog
1 file changed