Fossil SCM
Fix typo in warning message.
Commit
c80ee413ab77fb46b01c68ea82e2ad9a9446cc76
Parent
fda7c2c63dde08c…
2 files changed
+1
-1
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -509,11 +509,11 @@ | ||
| 509 | 509 | if( !nochangeFlag ){ |
| 510 | 510 | if( nConflict ){ |
| 511 | 511 | fossil_print("WARNING: %d merge conflicts", nConflict); |
| 512 | 512 | } |
| 513 | 513 | if( nOverwrite ){ |
| 514 | - fossil_warning("WARNING: %d unmanaged files where overwritten", | |
| 514 | + fossil_warning("WARNING: %d unmanaged files were overwritten", | |
| 515 | 515 | nOverwrite); |
| 516 | 516 | } |
| 517 | 517 | } |
| 518 | 518 | |
| 519 | 519 | /* |
| 520 | 520 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -509,11 +509,11 @@ | |
| 509 | if( !nochangeFlag ){ |
| 510 | if( nConflict ){ |
| 511 | fossil_print("WARNING: %d merge conflicts", nConflict); |
| 512 | } |
| 513 | if( nOverwrite ){ |
| 514 | fossil_warning("WARNING: %d unmanaged files where overwritten", |
| 515 | nOverwrite); |
| 516 | } |
| 517 | } |
| 518 | |
| 519 | /* |
| 520 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -509,11 +509,11 @@ | |
| 509 | if( !nochangeFlag ){ |
| 510 | if( nConflict ){ |
| 511 | fossil_print("WARNING: %d merge conflicts", nConflict); |
| 512 | } |
| 513 | if( nOverwrite ){ |
| 514 | fossil_warning("WARNING: %d unmanaged files were overwritten", |
| 515 | nOverwrite); |
| 516 | } |
| 517 | } |
| 518 | |
| 519 | /* |
| 520 |
+1
-1
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -465,11 +465,11 @@ | ||
| 465 | 465 | }else{ |
| 466 | 466 | fossil_print("WARNING: %d merge conflicts", nConflict); |
| 467 | 467 | } |
| 468 | 468 | } |
| 469 | 469 | if( nOverwrite ){ |
| 470 | - fossil_warning("WARNING: %d unmanaged files where overwritten", | |
| 470 | + fossil_warning("WARNING: %d unmanaged files were overwritten", | |
| 471 | 471 | nOverwrite); |
| 472 | 472 | } |
| 473 | 473 | } |
| 474 | 474 | |
| 475 | 475 | /* |
| 476 | 476 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -465,11 +465,11 @@ | |
| 465 | }else{ |
| 466 | fossil_print("WARNING: %d merge conflicts", nConflict); |
| 467 | } |
| 468 | } |
| 469 | if( nOverwrite ){ |
| 470 | fossil_warning("WARNING: %d unmanaged files where overwritten", |
| 471 | nOverwrite); |
| 472 | } |
| 473 | } |
| 474 | |
| 475 | /* |
| 476 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -465,11 +465,11 @@ | |
| 465 | }else{ |
| 466 | fossil_print("WARNING: %d merge conflicts", nConflict); |
| 467 | } |
| 468 | } |
| 469 | if( nOverwrite ){ |
| 470 | fossil_warning("WARNING: %d unmanaged files were overwritten", |
| 471 | nOverwrite); |
| 472 | } |
| 473 | } |
| 474 | |
| 475 | /* |
| 476 |