$OpenBSD: patch-bzrlib_diff_py,v 1.4 2011/01/10 20:18:09 eric Exp $ --- bzrlib/diff.py.orig Mon Dec 6 17:51:40 2010 +++ bzrlib/diff.py Mon Dec 6 17:51:33 2010 @@ -189,7 +189,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,