Fossil SCM
Remote the number of merge conflicts on an update. Ticket [769b4ed7b23e4cb7]
Commit
0b8aed945e5caf54c80b5a6fc09709b15a5a5d32
Parent
66d93f33d56adbd…
1 file changed
+2
-1
+2
-1
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -406,11 +406,12 @@ | ||
| 406 | 406 | */ |
| 407 | 407 | if( nConflict && !nochangeFlag ){ |
| 408 | 408 | if( internalUpdate ){ |
| 409 | 409 | internalConflictCnt = nConflict; |
| 410 | 410 | }else{ |
| 411 | - printf("WARNING: merge conflicts - see messages above for details.\n"); | |
| 411 | + printf("WARNING: %d merge conflicts - see messages above for details.\n", | |
| 412 | + nConflict); | |
| 412 | 413 | } |
| 413 | 414 | } |
| 414 | 415 | |
| 415 | 416 | /* |
| 416 | 417 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 417 | 418 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -406,11 +406,12 @@ | |
| 406 | */ |
| 407 | if( nConflict && !nochangeFlag ){ |
| 408 | if( internalUpdate ){ |
| 409 | internalConflictCnt = nConflict; |
| 410 | }else{ |
| 411 | printf("WARNING: merge conflicts - see messages above for details.\n"); |
| 412 | } |
| 413 | } |
| 414 | |
| 415 | /* |
| 416 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 417 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -406,11 +406,12 @@ | |
| 406 | */ |
| 407 | if( nConflict && !nochangeFlag ){ |
| 408 | if( internalUpdate ){ |
| 409 | internalConflictCnt = nConflict; |
| 410 | }else{ |
| 411 | printf("WARNING: %d merge conflicts - see messages above for details.\n", |
| 412 | nConflict); |
| 413 | } |
| 414 | } |
| 415 | |
| 416 | /* |
| 417 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 418 |