/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: John Arbash Meinel
  • Date: 2009-01-07 17:42:10 UTC
  • mfrom: (3923 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3925.
  • Revision ID: john@arbash-meinel.com-20090107174210-nsut7i65b1c66d5n
Merge bzr.dev 3923, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
99
99
        ud[2] = ud[2].replace('-1,0', '-0,0')
100
100
    elif not newlines:
101
101
        ud[2] = ud[2].replace('+1,0', '+0,0')
102
 
    # work around for difflib emitting random spaces after the label
103
 
    ud[0] = ud[0][:-2] + '\n'
104
 
    ud[1] = ud[1][:-2] + '\n'
105
102
 
106
103
    for line in ud:
107
104
        to_file.write(line)