Ticket UUID: | 769b4ed7b23e4cb72f8958b3a34bdc12f8dd2155 | ||
Title: | Show number of conflicts at the end of "fossil update" | ||
Status: | Fixed | Type: | Feature_Request |
Severity: | Minor | Priority: | |
Subsystem: | Resolution: | Fixed | |
Last Modified: | 2011-01-18 18:36:16 | ||
Version Found In: | 66d93f33d5 | ||
Description & Comments: | |||
When updating a larger tree with many changes, the fossil update output can be multiple pages long. At the end, it prints "WARNING: merge conflicts - see messages above for details." if there are any conflicts. It would make it easier to also tell how many files actually had a conflict, so that scanning the list is more efficient and less likely to just miss an item. |