Fossil SCM
minor verbiage patch from Christopher M. Fuhrman.
Commit
d4aee31257322c0489b8ddf50b3da8f2efcbab70
Parent
608f0b2371667fd…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -644,11 +644,11 @@ | ||
| 644 | 644 | fossil_warning("WARNING: %d unmanaged files were overwritten", |
| 645 | 645 | nOverwrite); |
| 646 | 646 | } |
| 647 | 647 | if( dryRunFlag ){ |
| 648 | 648 | fossil_warning("REMINDER: this was a dry run -" |
| 649 | - " no file were actually changed."); | |
| 649 | + " no files were actually changed."); | |
| 650 | 650 | } |
| 651 | 651 | |
| 652 | 652 | /* |
| 653 | 653 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 654 | 654 | */ |
| 655 | 655 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -644,11 +644,11 @@ | |
| 644 | fossil_warning("WARNING: %d unmanaged files were overwritten", |
| 645 | nOverwrite); |
| 646 | } |
| 647 | if( dryRunFlag ){ |
| 648 | fossil_warning("REMINDER: this was a dry run -" |
| 649 | " no file were actually changed."); |
| 650 | } |
| 651 | |
| 652 | /* |
| 653 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 654 | */ |
| 655 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -644,11 +644,11 @@ | |
| 644 | fossil_warning("WARNING: %d unmanaged files were overwritten", |
| 645 | nOverwrite); |
| 646 | } |
| 647 | if( dryRunFlag ){ |
| 648 | fossil_warning("REMINDER: this was a dry run -" |
| 649 | " no files were actually changed."); |
| 650 | } |
| 651 | |
| 652 | /* |
| 653 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 654 | */ |
| 655 |