--- bzrlib/diff.py.orig	Sat May 17 00:21:23 2008
+++ bzrlib/diff.py	Wed Jun 18 13:00:10 2008
@@ -175,11 +175,11 @@
         if not diff_opts:
             diff_opts = []
         diffcmd = ['diff',
-                   '--label', old_filename,
+                   '-L', old_filename,
                    old_abspath,
-                   '--label', new_filename,
+                   '--L', new_filename,
                    new_abspath,
-                   '--binary',
+                   '-a',
                   ]
 
         # diff only allows one style to be specified; they don't override.
