← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textinv.py

  • Committer: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/textinv.py
16
16
 
17
17
 
18
18
from bzrlib.errors import BzrError
19
 
from bzrlib.inventory import InventoryEntry, Inventory
 
19
from bzrlib.inventory import Inventory
20
20
 
21
21
 
22
22
START_MARK = "# bzr inventory format 3\n"