[MERGE REVIEW] Revert destroys file contents produced by merge

[Martin Pool]

On 1 Mar 2006, at 15:22 , Aaron Bentley wrote:

> === modified file 'bzrlib/errors.py'
> --- bzrlib/errors.py	
> +++ bzrlib/errors.py	
> @@ -708,3 +708,6 @@
>      def __init__(self, tree):
>          BzrNewError.__init__(self)
>          self.tree = tree
> +
> +class MergeModifiedFormatError(BzrNewError):
> +    """Error in merge modified format"""

If users ever see this error (which they should rarely/never do) then  
the message could be confusing.  Perhaps something like "Error  
reading list of files modified by merge" would be better.

Otherwise +1.

-- 
Martin Pool