~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mdiff.py

  • Committer: John Arbash Meinel
  • Date: 2005-09-15 21:35:53 UTC
  • mfrom: (907.1.57)
  • mto: (1393.2.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: john@arbash-meinel.com-20050915213552-a6c83a5ef1e20897
(broken) Transport work is merged in. Tests do not pass yet.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
33
30
import unittest
 
31
import difflib, sys, struct
34
32
from cStringIO import StringIO
35
33
 
36
 
 
37
34
def linesplit(a):
38
35
    """Split into two lists: content and line positions.
39
36