← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Martin
  • Date: 2009-07-02 08:40:50 UTC
  • mto: This revision was merged to the branch mainline in revision 4577.
  • Revision ID: gzlist@googlemail.com-20090702084050-l9o8e4ytwav9f18s
Fix copy-and-paste error in previous change

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
175
175
            # Popen doesn't do the proper encoding for external commands
176
176
            # Since we are dealing with an ANSI api, use mbcs encoding
177
177
            old_filename = old_filename.encode('mbcs')
178
 
            new_filename = old_filename.encode('mbcs')
 
178
            new_filename = new_filename.encode('mbcs')
179
179
        diffcmd = ['diff',
180
180
                   '--label', old_filename,
181
181
                   old_abspath,