Do another merge using nifty new merge script (CL for that coming soon).

third_party/WebKit/WebCore/editing/htmlediting.cpp

Index: third_party/WebKit/WebCore/editing/htmlediting.cpp
===================================================================
--- third_party/WebKit/WebCore/editing/htmlediting.cpp	(revision 5296)
+++ third_party/WebKit/WebCore/editing/htmlediting.cpp	(working copy)
@@ -856,6 +856,16 @@
     return 0;
 }
 
+unsigned numEnclosingMailBlockquotes(const Position& p)
+{
+    unsigned num = 0;
+    for (Node* n = p.node(); n; n = n->parentNode())
+        if (isMailBlockquote(n))
+            num++;
+    
+    return num;
+}
+
 bool isMailBlockquote(const Node *node)
 {
     if (!node || !node->isElementNode() && !node->hasTagName(blockquoteTag))