Fossil SCM

Show number of conflicts at the end of "fossil update"

Fixed

769b4ed7b23e4cb… · opened 15 years, 2 months ago

Type
Feature_Request
Priority
Severity
Minor
Resolution
Fixed
Subsystem
Created
Jan. 18, 2011 3:45 p.m.

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.

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button