252 Commits

Author	SHA1	Message	Date
Dr. Peter Poeml	211b197b26	- add diff3 merge support. Locally modified files are merged with upstream changes ... if possible, and go into Conflict state if that fails. - add 'resolved' command to be used after manual merging.	2006-05-22 14:12:06 +00:00
Dr. Peter Poeml	2c37f7287d	- allow 'up' of a project directory (will automatically pull in all new ... packages) - add NEWS file	2006-05-22 10:50:37 +00:00