Check-in [7b7a4bd579]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
SHA1:7b7a4bd579443a0e643da7b68ef1f1c6dba7bcc5
Date: 2013-07-22 09:23:09
User: jan.nijtmans
Comment:rebase
Tags And Properties
Context
2013-07-22
09:23
[7b7a4bd579] Leaf: rebase (user: jan.nijtmans, tags: merge-integrate)
08:55
[c41d70dccd] Better outlining of output from "fossil status", "fossil changes" and "fossil ls --verbose". Let "fossil ls --verbose" differentiate between EDITED, CONFLICT, UPD_BY_MERGE and ADD_BY_MERGE, just like "fossil status" and "fossil changes" (user: jan.nijtmans, tags: trunk)
07:52
[c9ee3ff674] Fix bug. (user: jan.nijtmans, tags: merge-integrate)
Changes

Changes to src/checkin.c.

Changes to src/json_status.c.

Changes to src/merge.c.

Changes to src/schema.c.

Changes to src/vfile.c.

Changes to www/changes.wiki.