source: mergebot/trunk @ 62

Name Size Rev Age Author Last Change
../
mergebot 62   15 years retracile Mergebot: handle property merge conflicts, and add tests for it
utils 62   15 years retracile Mergebot: handle property merge conflicts, and add tests for it
COPYING 1.1 KB 17   15 years retracile Mergebot: redesigned implementation. Still has rough edges.
README.txt 1.2 KB 24   15 years retracile Ticket #2: merge to trunk
setup.cfg 54 bytes 16   15 years retracile Mergebot: Codebase as released with permission from CommProve?, plus …
setup.py 799 bytes 26   15 years retracile Bump minor version number
Note: See TracBrowser for help on using the repository browser.