← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mdiff.py

  • Committer: Martin Pool
  • Date: 2005-10-06 10:53:12 UTC
  • mto: (1185.13.3)
  • mto: This revision was merged to the branch mainline in revision 1418.
  • Revision ID: mbp@sourcefrog.net-20051006105312-06320dbb986e4bb3
- test that we cannot join weaves with different ancestry

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mdiff.py
27
27
 
28
28
# FIXME: doesn't work properly on files without trailing newlines
29
29
 
 
30
import difflib
 
31
import struct
 
32
import sys
30
33
import unittest
31
 
import difflib, sys, struct
32
34
from cStringIO import StringIO
33
35
 
 
36
 
34
37
def linesplit(a):
35
38
    """Split into two lists: content and line positions.
36
39