Fossil SCM
Reporting the number of merge conflicts at the end of merge, as with update. I think the information is of value to the user. I think that had to be introduced in [070ce24d838a6], from its comment, but that change made the opposite of commented.
Commit
e1a7a1d9e267213e2adeaa06a68b00151334b282
Parent
60c6197c8a5fede…
1 file changed
+2
-1
+2
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -497,11 +497,12 @@ | ||
| 497 | 497 | |
| 498 | 498 | /* Report on conflicts |
| 499 | 499 | */ |
| 500 | 500 | if( nConflict && !nochangeFlag ){ |
| 501 | 501 | fossil_warning( |
| 502 | - "WARNING: merge conflicts - see messages above for details.\n"); | |
| 502 | + "WARNING: %d merge conflicts - see messages above for details.\n", | |
| 503 | + nConflict); | |
| 503 | 504 | } |
| 504 | 505 | |
| 505 | 506 | /* |
| 506 | 507 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 507 | 508 | */ |
| 508 | 509 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -497,11 +497,12 @@ | |
| 497 | |
| 498 | /* Report on conflicts |
| 499 | */ |
| 500 | if( nConflict && !nochangeFlag ){ |
| 501 | fossil_warning( |
| 502 | "WARNING: merge conflicts - see messages above for details.\n"); |
| 503 | } |
| 504 | |
| 505 | /* |
| 506 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 507 | */ |
| 508 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -497,11 +497,12 @@ | |
| 497 | |
| 498 | /* Report on conflicts |
| 499 | */ |
| 500 | if( nConflict && !nochangeFlag ){ |
| 501 | fossil_warning( |
| 502 | "WARNING: %d merge conflicts - see messages above for details.\n", |
| 503 | nConflict); |
| 504 | } |
| 505 | |
| 506 | /* |
| 507 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 508 | */ |
| 509 |