1703
1703
# FIXME: This should really happen before the file is read in;
1704
1704
# perhaps prepare the commit; get the message; then actually commit
1708
1708
raise BzrCommandError("Conflicts detected in working tree. "
1709
1709
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')