@@ -139,11 +139,11 @@
 ** Text of boundary markers for merge conflicts.
 */
 static const char *const mergeMarker[] = {
  /*123456789 123456789 123456789 123456789 123456789 123456789 123456789*/
   "<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<\n",
-  "======= COMMON ANCESTOR content follows ============================\n",
+  "||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||||||\n",
   "======= MERGED IN content follows ==================================\n",
   ">>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"
 };