2011-12-23 12:12:04 -05:00
|
|
|
$OpenBSD: patch-bzrlib_diff_py,v 1.5 2011/12/23 17:12:04 eric Exp $
|
|
|
|
|
--- bzrlib/diff.py.orig Thu Oct 27 15:21:20 2011
|
|
|
|
|
+++ bzrlib/diff.py Thu Dec 22 17:15:46 2011
|
|
|
|
|
@@ -187,7 +187,7 @@ def external_diff(old_filename, oldlines, new_filename
|
2009-09-19 18:08:52 -04:00
|
|
|
# Since we are dealing with an ANSI api, use mbcs encoding
|
|
|
|
|
old_filename = old_filename.encode('mbcs')
|
|
|
|
|
new_filename = new_filename.encode('mbcs')
|
2007-03-18 16:05:28 -04:00
|
|
|
- diffcmd = ['diff',
|
|
|
|
|
+ diffcmd = ['gdiff',
|
|
|
|
|
'--label', old_filename,
|
|
|
|
|
old_abspath,
|
|
|
|
|
'--label', new_filename,
|
