]> scripts.mit.edu Git - wizard.git/commit
Implement MediaWiki scaffolding for auto conflict resolution; untested.
authorEdward Z. Yang <ezyang@mit.edu>
Sat, 10 Oct 2009 06:39:52 +0000 (02:39 -0400)
committerEdward Z. Yang <ezyang@mit.edu>
Sat, 10 Oct 2009 06:39:52 +0000 (02:39 -0400)
commit1b75c0b4b6c16de49ce5c270ee02c8650630aae5
tree0dbda01b382326e3b15caa70baa3e8cea7f00115
parent220b036751ee12ff5dce564d93330bdb6f9ce903
Implement MediaWiki scaffolding for auto conflict resolution; untested.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
wizard/app/mediawiki.py
wizard/command/upgrade.py
wizard/deploy.py
wizard/resolve.py
wizard/tests/resolve_test.py