← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2009-12-02 18:15:55 UTC
  • mto: This revision was merged to the branch mainline in revision 4854.
  • Revision ID: john@arbash-meinel.com-20091202181555-iowrcmizneehhcez
Minor typo fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
547
547
        except errors.NoSuchFile:
548
548
            pass
549
549
        else:
550
 
            for l in osutils.split_lines(merges_bytes)):
 
550
            for l in osutils.split_lines(merges_bytes):
551
551
                revision_id = l.rstrip('\n')
552
552
                parents.append(revision_id)
553
553
        return parents