Timeline
Not logged in

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

2 check-ins using file src/merge.c version f14cebbdd6

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