Fossil SCM
Change merge conflict marker for common ancestor to follow [|diff3 convention]; see also: [https://fossil-scm.org/forum/forumpost/f54f22dd99 | forumpost/f54f22dd99]
Commit
d7bc466ac624e128544f7c5ff63300ae7715cd46475c96e642437b16daed08bd
Parent
17610f8d7307b36…
1 file changed
+1
-1
+1
-1
| --- src/merge3.c | ||
| +++ src/merge3.c | ||
| @@ -139,11 +139,11 @@ | ||
| 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 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -139,11 +139,11 @@ | |
| 139 | ** Text of boundary markers for merge conflicts. |
| 140 | */ |
| 141 | static const char *const mergeMarker[] = { |
| 142 | /*123456789 123456789 123456789 123456789 123456789 123456789 123456789*/ |
| 143 | "<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<\n", |
| 144 | "======= COMMON ANCESTOR content follows ============================\n", |
| 145 | "======= MERGED IN content follows ==================================\n", |
| 146 | ">>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" |
| 147 | }; |
| 148 | |
| 149 | |
| 150 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -139,11 +139,11 @@ | |
| 139 | ** Text of boundary markers for merge conflicts. |
| 140 | */ |
| 141 | static const char *const mergeMarker[] = { |
| 142 | /*123456789 123456789 123456789 123456789 123456789 123456789 123456789*/ |
| 143 | "<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<\n", |
| 144 | "||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||||||\n", |
| 145 | "======= MERGED IN content follows ==================================\n", |
| 146 | ">>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" |
| 147 | }; |
| 148 | |
| 149 | |
| 150 |