# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: gzlist@googlemail.com-20090702084050-l9o8e4ytwav9f18s
# target_branch: http://bazaar.launchpad.net/%7Ejameinel/bzr/1.16-\
#   external_diff_encoded-382709/
# testament_sha1: 3058bcd2dc383e58704cd12b954ed7dc19f29967
# timestamp: 2009-07-02 09:41:58 +0100
# base_revision_id: john@arbash-meinel.com-20090610041307-\
#   s8ferbew1o9y9wbk
# 
# Begin patch
=== modified file 'bzrlib/diff.py'
--- bzrlib/diff.py	2009-06-10 04:13:07 +0000
+++ bzrlib/diff.py	2009-07-02 08:40:50 +0000
@@ -175,7 +175,7 @@
             # Popen doesn't do the proper encoding for external commands
             # Since we are dealing with an ANSI api, use mbcs encoding
             old_filename = old_filename.encode('mbcs')
-            new_filename = old_filename.encode('mbcs')
+            new_filename = new_filename.encode('mbcs')
         diffcmd = ['diff',
                    '--label', old_filename,
                    old_abspath,

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZSJb10AAXtfgABQUeP//1MC
AAC//9/wUAN54HTd3aSXYElJkk/SZR+lNmVGnpHqeUep+qNANBoEqakbSbU2Kaepo0GgAAA0Aaaa
lT9NNNRqeiekyaZBp6gDaINAwAA0AAZNAAAGgEkgEAI1PQo9T2og9J5JoaZNqHyZ9Qnv43m7NFiC
1hrkXQAfRoRRoyxlaMLCCYezfMIg2EXB/TnlyQxp++/2kcE8i28gUlhfqmblblL5BOyqeI9d0daP
1v/V5QRzO5n43i9ER3hsgeqRfosDLdbHqi+QqtBObC0NUK8T2MCKoqBPok5PB50BwoKoT1ERSBL0
77RQ+lwPV0LLeV9mJILTzI9ZWJ3huE0zsF1KVnkhZiuiRgcovCJIkOGOZaSCQMpmMBtpQryrJitq
VZMcDjcbSUt0yiYrkYDxV2wuLYCPPOzCmJod5yW2ZoZkyBle5HA97lrLw5Thg1gKWLipQmVaKEU8
JR7CEluwVCskXzK6bBx1FqEBXmV1qFjUZFuEyW/sKs0FqGAXzNl1aYsUHm0I9D4dTRhasZ+8SRd3
s/gzbi23EdHWouIp0gK2Z6EEnictXTt3CUq2IBn4wobmhEK8/7plZeWEg8UoTYEHTh4cAsF9zCit
SFNtBnJxwYSBKhuENRGDQ2jQxGYJCCH6mfXHE86pECyZBxTaPTx6d1KIwJHSg1l3NvfgR7uX2r4O
a3437iBtIlRqKRcdJWDS/sgyDgztJGhQehlbWZsbDwwDEL0GvCPmmRXnnmHi7w4hqXqpBgGBNeMc
rF0FMNBhxoQ3DHxC4X5+uWhi5dXcRfNLql+/UyaZgGYwGa3hyrqwyZzWocYitSihq2Ggbgr4Sop5
wM0EEseLmyvUcWMVwYQBgnrIV7VNJjf9UoeXLDikWJTXrMLA5b7TuqltID2ZdAYK7DeTcNIIsHaL
oWyB7IZcuYvYOBZYl/geCmBLoS1IczINa30Kp91pGMVspOQKtr3vGea1EYqgNiAQGxw05d05llVV
fNldCsDPBrIuC3mLS15zAc1YzamdQMWncA0VIek0YobdycUS59hw1TZksch40gmJzK32E8+/GVLR
UWCSuFqFjwrhoDog93kKkzJKnH/i7kinChISkS3roA==