Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Parents and children of check-in [65f495bc06]
|
2012-10-22
| ||
| 13:23 | Merge the changes to show unresolved conflicts in "fossil status" and to prevent committing unresolved conflicts. check-in: 7d34d1748a user: drh tags: trunk | |
|
2012-10-21
| ||
| 00:52 | Fix a crash bug that comes up when trying to view the history of files whose names contain charaters that require URL escapes. Closed-Leaf check-in: 65f495bc06 user: drh tags: conflict-tracking | |
|
2012-10-20
| ||
| 00:29 | Report unresolved conflicts on "fossil status". Refuse to commit with unresolved conflicts if the --conflict flag is omitted from "fossil commit". check-in: 1fb2ca625b user: drh tags: conflict-tracking | |