Fossil SCM
Reverse the direction of conflict markers. Ticket [e3a1beef67c97eb2e4d5a]
Commit
93984e2d86b3d32b92aa49322aee6f28ad30ceb6
Parent
c345445cad799c8…
1 file changed
+2
-2
+2
-2
| --- src/merge3.c | ||
| +++ src/merge3.c | ||
| @@ -151,13 +151,13 @@ | ||
| 151 | 151 | int *aC2; /* Changes from pPivot to pV2 */ |
| 152 | 152 | int i1, i2; /* Index into aC1[] and aC2[] */ |
| 153 | 153 | int nCpy, nDel, nIns; /* Number of lines to copy, delete, or insert */ |
| 154 | 154 | int limit1, limit2; /* Sizes of aC1[] and aC2[] */ |
| 155 | 155 | int nConflict = 0; /* Number of merge conflicts seen so far */ |
| 156 | - static const char zBegin[] = ">>>>>>> BEGIN MERGE CONFLICT\n"; | |
| 156 | + static const char zBegin[] = "<<<<<<< BEGIN MERGE CONFLICT\n"; | |
| 157 | 157 | static const char zMid[] = "============================\n"; |
| 158 | - static const char zEnd[] = "<<<<<<< END MERGE CONFLICT\n"; | |
| 158 | + static const char zEnd[] = ">>>>>>> END MERGE CONFLICT\n"; | |
| 159 | 159 | |
| 160 | 160 | blob_zero(pOut); /* Merge results stored in pOut */ |
| 161 | 161 | |
| 162 | 162 | /* Compute the edits that occur from pPivot => pV1 (into aC1) |
| 163 | 163 | ** and pPivot => pV2 (into aC2). Each of the aC1 and aC2 arrays is |
| 164 | 164 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -151,13 +151,13 @@ | |
| 151 | int *aC2; /* Changes from pPivot to pV2 */ |
| 152 | int i1, i2; /* Index into aC1[] and aC2[] */ |
| 153 | int nCpy, nDel, nIns; /* Number of lines to copy, delete, or insert */ |
| 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[] = ">>>>>>> BEGIN MERGE CONFLICT\n"; |
| 157 | static const char zMid[] = "============================\n"; |
| 158 | static const char zEnd[] = "<<<<<<< END MERGE CONFLICT\n"; |
| 159 | |
| 160 | blob_zero(pOut); /* Merge results stored in pOut */ |
| 161 | |
| 162 | /* Compute the edits that occur from pPivot => pV1 (into aC1) |
| 163 | ** and pPivot => pV2 (into aC2). Each of the aC1 and aC2 arrays is |
| 164 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -151,13 +151,13 @@ | |
| 151 | int *aC2; /* Changes from pPivot to pV2 */ |
| 152 | int i1, i2; /* Index into aC1[] and aC2[] */ |
| 153 | int nCpy, nDel, nIns; /* Number of lines to copy, delete, or insert */ |
| 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[] = "<<<<<<< BEGIN MERGE CONFLICT\n"; |
| 157 | static const char zMid[] = "============================\n"; |
| 158 | static const char zEnd[] = ">>>>>>> END MERGE CONFLICT\n"; |
| 159 | |
| 160 | blob_zero(pOut); /* Merge results stored in pOut */ |
| 161 | |
| 162 | /* Compute the edits that occur from pPivot => pV1 (into aC1) |
| 163 | ** and pPivot => pV2 (into aC2). Each of the aC1 and aC2 arrays is |
| 164 |