Fossil SCM
Tweaks to the merge conflict notation.
Commit
bf919337bb4c2f2d08391cb42fdf8f64ba773937
Parent
daeb10f65f90833…
1 file changed
+2
-2
+2
-2
| --- src/merge3.c | ||
| +++ src/merge3.c | ||
| @@ -154,13 +154,13 @@ | ||
| 154 | 154 | int limit1, limit2; /* Sizes of aC1[] and aC2[] */ |
| 155 | 155 | int nConflict = 0; /* Number of merge conflicts seen so far */ |
| 156 | 156 | static const char zBegin[] = |
| 157 | 157 | "<<<<<<< BEGIN MERGE CONFLICT: original content first <<<<<<<\n"; |
| 158 | 158 | static const char zMid[] = |
| 159 | - "======= original content above; merged content below =======\n"; | |
| 159 | + "======= original content above; conflict below =============\n"; | |
| 160 | 160 | static const char zEnd[] = |
| 161 | - ">>>>>>> END MERGE CONFLICT: merged content last >>>>>>>>>>>>\n"; | |
| 161 | + ">>>>>>> END MERGE CONFLICT: conflict last >>>>>>>>>>>>>>>>>>\n"; | |
| 162 | 162 | |
| 163 | 163 | blob_zero(pOut); /* Merge results stored in pOut */ |
| 164 | 164 | |
| 165 | 165 | /* Compute the edits that occur from pPivot => pV1 (into aC1) |
| 166 | 166 | ** and pPivot => pV2 (into aC2). Each of the aC1 and aC2 arrays is |
| 167 | 167 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -154,13 +154,13 @@ | |
| 154 | int limit1, limit2; /* Sizes of aC1[] and aC2[] */ |
| 155 | int nConflict = 0; /* Number of merge conflicts seen so far */ |
| 156 | static const char zBegin[] = |
| 157 | "<<<<<<< BEGIN MERGE CONFLICT: original content first <<<<<<<\n"; |
| 158 | static const char zMid[] = |
| 159 | "======= original content above; merged content below =======\n"; |
| 160 | static const char zEnd[] = |
| 161 | ">>>>>>> END MERGE CONFLICT: merged content last >>>>>>>>>>>>\n"; |
| 162 | |
| 163 | blob_zero(pOut); /* Merge results stored in pOut */ |
| 164 | |
| 165 | /* Compute the edits that occur from pPivot => pV1 (into aC1) |
| 166 | ** and pPivot => pV2 (into aC2). Each of the aC1 and aC2 arrays is |
| 167 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -154,13 +154,13 @@ | |
| 154 | int limit1, limit2; /* Sizes of aC1[] and aC2[] */ |
| 155 | int nConflict = 0; /* Number of merge conflicts seen so far */ |
| 156 | static const char zBegin[] = |
| 157 | "<<<<<<< BEGIN MERGE CONFLICT: original content first <<<<<<<\n"; |
| 158 | static const char zMid[] = |
| 159 | "======= original content above; conflict below =============\n"; |
| 160 | static const char zEnd[] = |
| 161 | ">>>>>>> END MERGE CONFLICT: conflict last >>>>>>>>>>>>>>>>>>\n"; |
| 162 | |
| 163 | blob_zero(pOut); /* Merge results stored in pOut */ |
| 164 | |
| 165 | /* Compute the edits that occur from pPivot => pV1 (into aC1) |
| 166 | ** and pPivot => pV2 (into aC2). Each of the aC1 and aC2 arrays is |
| 167 |