Fossil

Diff
Login

Differences From Artifact [d4892488]:

To Artifact [f9759d72]:


   137    137   
   138    138   /*
   139    139   ** Text of boundary markers for merge conflicts.
   140    140   */
   141    141   static const char *const mergeMarker[] = {
   142    142    /*123456789 123456789 123456789 123456789 123456789 123456789 123456789*/
   143    143     "<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<\n",
   144         -  "======= COMMON ANCESTOR content follows ============================\n",
          144  +  "||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||||||\n",
   145    145     "======= MERGED IN content follows ==================================\n",
   146    146     ">>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"
   147    147   };
   148    148   
   149    149   
   150    150   /*
   151    151   ** Do a three-way merge.  Initialize pOut to contain the result.