Overview
| Artifact ID: | e37e206f1f4e4b7c896a8ca00eccdc34f1aa7e72 |
|---|---|
| Ticket: | 24e1e78fa301399e5711c3786594819445694668
Files in conflict are not marked as so |
| User & Date: | anonymous 2010-10-15 07:47:28 |
Changes
- comment changed to:
I do a fossil update, and am reported a file is in conflict: $ fossil up MERGE hello.txt ***** 1 merge conflicts in hello.txt but then when I do fossil st: $ fossil st ... EDITED hello.txt If I had a long list of files, I would like to know which ones are in conflict and which not.
- foundin changed to: "b48f78964e"
- private_contact changed to: "fbbc887beb8da03d2f38921a58bf0501ff03b2dc"
- severity changed to: "Important"
- status changed to: "Open"
- title changed to: "Files in conflict are not marked as so"
- type changed to: "Code_Defect"