13 lines
601 B
Plaintext
13 lines
601 B
Plaintext
$OpenBSD: patch-bzrlib_diff_py,v 1.3 2009/09/19 22:08:52 fgsch Exp $
|
|
--- bzrlib/diff.py.orig Mon Sep 14 23:11:06 2009
|
|
+++ bzrlib/diff.py Mon Sep 14 23:11:13 2009
|
|
@@ -176,7 +176,7 @@ def external_diff(old_filename, oldlines, new_filename
|
|
# Since we are dealing with an ANSI api, use mbcs encoding
|
|
old_filename = old_filename.encode('mbcs')
|
|
new_filename = new_filename.encode('mbcs')
|
|
- diffcmd = ['diff',
|
|
+ diffcmd = ['gdiff',
|
|
'--label', old_filename,
|
|
old_abspath,
|
|
'--label', new_filename,
|