Fossil SCM
improve warning message for binary merge conflict on update.
Commit
d4d739898dc5de0c2cf7b48395d3d80a50aa44a7b9da25ba040459edaaa79f91
Parent
d2b02566a788bf6…
1 file changed
+1
-1
+1
-1
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -529,11 +529,11 @@ | ||
| 529 | 529 | blob_write_to_file(&t, zFullNewPath); |
| 530 | 530 | file_setexe(zFullNewPath, isexe); |
| 531 | 531 | } |
| 532 | 532 | fossil_print("***** Cannot merge binary file %s", zNewName); |
| 533 | 533 | if( !dryRunFlag ){ |
| 534 | - fossil_print(", original copy is backup locally"); | |
| 534 | + fossil_print(", original copy backed up locally"); | |
| 535 | 535 | } |
| 536 | 536 | fossil_print("\n"); |
| 537 | 537 | nConflict++; |
| 538 | 538 | } |
| 539 | 539 | } |
| 540 | 540 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -529,11 +529,11 @@ | |
| 529 | blob_write_to_file(&t, zFullNewPath); |
| 530 | file_setexe(zFullNewPath, isexe); |
| 531 | } |
| 532 | fossil_print("***** Cannot merge binary file %s", zNewName); |
| 533 | if( !dryRunFlag ){ |
| 534 | fossil_print(", original copy is backup locally"); |
| 535 | } |
| 536 | fossil_print("\n"); |
| 537 | nConflict++; |
| 538 | } |
| 539 | } |
| 540 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -529,11 +529,11 @@ | |
| 529 | blob_write_to_file(&t, zFullNewPath); |
| 530 | file_setexe(zFullNewPath, isexe); |
| 531 | } |
| 532 | fossil_print("***** Cannot merge binary file %s", zNewName); |
| 533 | if( !dryRunFlag ){ |
| 534 | fossil_print(", original copy backed up locally"); |
| 535 | } |
| 536 | fossil_print("\n"); |
| 537 | nConflict++; |
| 538 | } |
| 539 | } |
| 540 |