Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch conflict-tracking Excluding Merge-Ins
This is equivalent to a diff from e40e4faabb to 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:54 | Fix a crash bug that comes up when trying to view the history of files whose names contain charaters that require URL escapes. This is a cherry-pick of [65f495bc06767] which was committed to the wrong branch. check-in: 9c6f9e7a8c user: drh tags: trunk | |
| 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 | |
|
2012-10-19
| ||
| 18:36 | Add a mention of the ability to do dynamic loading of Tcl to the change log. (This change originally checked into the wrong branch.) check-in: e40e4faabb user: drh tags: trunk | |
| 17:04 | Fix a typo in the Style document. check-in: 2116906fb1 user: drh tags: trunk | |
Changes to src/checkin.c.
Changes to src/finfo.c.
Changes to src/merge3.c.