Fossil SCM
Minor correction to comment, no code change.
Commit
d397f1cdc4a86300fc96ae1d57c4d8632272f450
Parent
fad1dd0a8ed0a77…
1 file changed
+1
-1
+1
-1
| --- src/merge3.c | ||
| +++ src/merge3.c | ||
| @@ -260,11 +260,11 @@ | ||
| 260 | 260 | i2 += 3; |
| 261 | 261 | }else |
| 262 | 262 | { |
| 263 | 263 | /* We have found a region where different edits to V1 and V2 overlap. |
| 264 | 264 | ** This is a merge conflict. Find the size of the conflict, then |
| 265 | - ** output both possible edits separate by distinctive marks. | |
| 265 | + ** output both possible edits separated by distinctive marks. | |
| 266 | 266 | */ |
| 267 | 267 | int sz = 1; /* Size of the conflict in lines */ |
| 268 | 268 | nConflict++; |
| 269 | 269 | while( !ends_at_CPY(&aC1[i1], sz) || !ends_at_CPY(&aC2[i2], sz) ){ |
| 270 | 270 | sz++; |
| 271 | 271 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -260,11 +260,11 @@ | |
| 260 | i2 += 3; |
| 261 | }else |
| 262 | { |
| 263 | /* We have found a region where different edits to V1 and V2 overlap. |
| 264 | ** This is a merge conflict. Find the size of the conflict, then |
| 265 | ** output both possible edits separate by distinctive marks. |
| 266 | */ |
| 267 | int sz = 1; /* Size of the conflict in lines */ |
| 268 | nConflict++; |
| 269 | while( !ends_at_CPY(&aC1[i1], sz) || !ends_at_CPY(&aC2[i2], sz) ){ |
| 270 | sz++; |
| 271 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -260,11 +260,11 @@ | |
| 260 | i2 += 3; |
| 261 | }else |
| 262 | { |
| 263 | /* We have found a region where different edits to V1 and V2 overlap. |
| 264 | ** This is a merge conflict. Find the size of the conflict, then |
| 265 | ** output both possible edits separated by distinctive marks. |
| 266 | */ |
| 267 | int sz = 1; /* Size of the conflict in lines */ |
| 268 | nConflict++; |
| 269 | while( !ends_at_CPY(&aC1[i1], sz) || !ends_at_CPY(&aC2[i2], sz) ){ |
| 270 | sz++; |
| 271 |