2934
2934
# FIXME: This should really happen before the file is read in;
2935
2935
# perhaps prepare the commit; get the message; then actually commit
2939
2939
raise errors.BzrCommandError('Conflicts detected in working '
2940
2940
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'