From ee98c9fddb84528011f1c789b90392e22110edce Mon Sep 17 00:00:00 2001
From: "laforge@chromium.org"
 <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 17 Dec 2009 23:58:10 +0000
Subject: [PATCH] Add eol ignore logic to make webkit merges less problematic.

Review URL: http://codereview.chromium.org/505042

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34895 0039d316-1c4b-4281-b951-d872f2087c98
---
 drover.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drover.py b/drover.py
index 5e27e1189..e0ab98fa7 100644
--- a/drover.py
+++ b/drover.py
@@ -228,6 +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 += url + path + "@" + str(revision) + " ." + path
 
     print command