Timeline
Not logged in

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

6 check-ins using file src/json_status.c version 75f3d7432f

2013-07-12
14:26
typo check-in: 011a4ad1eb user: jan.nijtmans tags: merge-integrate
11:33
rebase check-in: a745092fbc user: jan.nijtmans tags: merge-integrate
08:05
In case of a dry-run, output manifest before printing other information about the merge. check-in: 72713b7d66 user: jan.nijtmans tags: merge-integrate
07:58
Minor tweaks in error/warning messages. Well-tested now. check-in: 5f4b03ebf0 user: jan.nijtmans tags: merge-integrate
2013-07-11
15:20
Implementation complete. Should be thorougly tested now. check-in: 491dd37970 user: jan.nijtmans tags: merge-integrate
08:47
Implement "fossil merge --integrate" as suggested by Harald Oehlmann. The only part missing is the actual closing of the branch. check-in: b984ecaf1d user: jan.nijtmans tags: merge-integrate