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
..
__init__.py	- reorganize source to build a python module	2006-05-10 14:21:51 +00:00
commandline.py	- add diff3 merge support. Locally modified files are merged with upstream changes	2006-05-22 14:12:06 +00:00
core.py	- add diff3 merge support. Locally modified files are merged with upstream changes	2006-05-22 14:12:06 +00:00
othermethods.py	- reorganize source to build a python module	2006-05-10 14:21:51 +00:00