Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Change merge conflict marker for common ancestor to follow [https://www.gnu.org/software/diffutils/manual/html_node/Marking-Conflicts.html#Marking-Conflicts|diff3 convention]; see also: [https://fossil-scm.org/forum/forumpost/f54f22dd99 | forumpost/f54f22dd99] |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
d7bc466ac624e128544f7c5ff63300ae |
| User & Date: | ashepilko 2020-05-09 17:16:08.773 |
| Original Comment: | Change merge conflict marker for common ancestor to follow [|diff3 convention]; see also: [https://fossil-scm.org/forum/forumpost/f54f22dd99 | forumpost/f54f22dd99] |
Context
|
2020-05-09
| ||
| 17:21 | File History file links to use /file?name form, to handle paths with spaces. check-in: c00527e825 user: ashepilko tags: trunk | |
| 17:16 | Change merge conflict marker for common ancestor to follow [https://www.gnu.org/software/diffutils/manual/html_node/Marking-Conflicts.html#Marking-Conflicts|diff3 convention]; see also: [https://fossil-scm.org/forum/forumpost/f54f22dd99 | forumpost/f54f22dd99] check-in: d7bc466ac6 user: ashepilko tags: trunk | |
| 14:23 | Update the built-in SQLite to the first 3.32.0 beta. check-in: 17610f8d73 user: drh tags: trunk | |
Changes
Changes to src/merge3.c.
| ︙ | ︙ | |||
137 138 139 140 141 142 143 |
/*
** 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",
| | | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 |
/*
** 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",
"======= MERGED IN content follows ==================================\n",
">>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"
};
/*
** Do a three-way merge. Initialize pOut to contain the result.
|
| ︙ | ︙ |