Explicitly pass "--diff-cmd diff" to "svn diff", for users who have set some other diff tool.

Review URL: https://chromiumcodereview.appspot.com/14130006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@194740 0039d316-1c4b-4281-b951-d872f2087c98

scm.py

@@ -803,7 +803,8 @@ class SVN(object):
   @staticmethod
   def _DiffItemInternal(filename, cwd, info, bogus_dir, full_move, revision):
     """Grabs the diff data."""
-    command = ["diff", "--config-dir", bogus_dir, filename]
+    command = ["diff", "--diff-cmd", "diff", "--config-dir", bogus_dir,
+               filename]
     if revision:
       command.extend(['--revision', revision])
     data = None
@@ -915,7 +916,8 @@ class SVN(object):
               # revision the file was deleted.
               srcinfo = {'Revision': rev}
             if (srcinfo.get('Revision') != rev and
-                SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl], cwd)):
+                SVN.Capture(['diff', '--diff-cmd', 'diff', '-r',
+                             '%d:head' % rev, srcurl], cwd)):
               metaheaders.append("#$ svn cp -r %d %s %s "
                                  "### WARNING: note non-trunk copy\n" %
                                  (rev, src, filename))