Fix a character encoding issue

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

drover.py

@@ -228,7 +228,7 @@ def mergeRevision(url, revision):
       continue
     command = ('svn merge -N -r ' + str(revision-1) + ":" + str(revision) + " ")
     command += " --ignore-ancestry "
-    command += " -x ignore-eol-style "
+    command += " -x --ignore-eol-style "
     command += url + path + "@" + str(revision) + " ." + path
 
     print command