Failed to apply patch for DEPS:
While running git apply --index -3 -p1;
error: patch failed: DEPS:10
Falling back to three-way merge...
Applied patch to 'DEPS' with conflicts.
U DEPS
Patch: DEPS
Index: DEPS
diff --git a/DEPS b/DEPS
index
9245f9b4c0a126e5974ce740ddead2452c9568a8..2306652115f23f55636655f45464f516653827f4
100644
--- a/DEPS
+++ b/DEPS
@@ -10,7 +10,7 @@ deps = {
"v8/build/gyp":
Var("git_url") + "/external/gyp.git" + "@" +
"d174d75bf69c682cb62af9187879e01513b35e52",
"v8/third_party/icu":
- Var("git_url") + "/chromium/deps/icu.git" + "@" +
"d319ad9e25e8045f051dcd30bd5835f99936af6c",
+ Var("git_url") + "/chromium/deps/icu.git" + "@" +
"009e7a78d921586361bb0a14890e3e35d24edcf0",
"v8/buildtools":
Var("git_url") + "/chromium/buildtools.git" + "@" +
"3b302fef93f7cc58d9b8168466905237484b2772",
"v8/testing/gtest":
https://codereview.chromium.org/1029473002/
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
