]> scripts.mit.edu Git - wizard.git/history - wizard/resolve.py
Remove string exception from remaster.
[wizard.git] / wizard / resolve.py
2010-01-11  Edward Z. YangFill out missing documentation.
2009-12-22  Edward Z. YangUse diff3 conflict style, which gives more information.
2009-10-17  Edward Z. YangFix pylint errors.
2009-10-17  Edward Z. YangMove generic functionality out of wizard.app.mediawiki.
2009-10-12  Edward Z. YangMajor updates to resolution code from runs.
2009-10-10  Edward Z. YangImplement MediaWiki scaffolding for auto conflict resol...
2009-10-10  Edward Z. YangImplement backend for automatic conflict resolution.