← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Fix error handling for merge_modified

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
61
61
                           WeaveRevisionNotPresent,
62
62
                           NotBranchError,
63
63
                           NoSuchFile,
64
 
                           NotVersionedError)
 
64
                           NotVersionedError,
 
65
                           MergeModifiedFormatError)
65
66
from bzrlib.inventory import InventoryEntry, Inventory
66
67
from bzrlib.lockable_files import LockableFiles, TransportLock
67
68
from bzrlib.merge import merge_inner, transform_tree