[Monotone-commits-nodiffs] Revision 2bd5affacb5bec48dcae50d312a9c76d1bf2b250

[monotone]

-----------------------------------------------------------------
Revision: 2bd5affacb5bec48dcae50d312a9c76d1bf2b250
Ancestor: 11ead8feb27ae0714e316b19b0f7af856d43cbfa
Ancestor: 2f2e68d81f5a12ebfca4e040fd3644070196126c
Author: Richard Levitte <address@hidden>
Date: 2008-05-01T21:41:12
Branch: net.venge.monotone.web

Added files:
        docs/Merge-Conflicts.html res/merging-fest-transparent.png
Modified files:
        NEWS UPGRADE docs/Additional-Lua-Functions.html
        docs/Advanced-Uses.html docs/Automation.html
        docs/Branches.html docs/Command-Reference.html
        docs/Concepts.html docs/Creating-a-Database.html
        docs/Default-hooks.html docs/File-Attributes.html
        docs/General-Index.html docs/Hook-Reference.html
        docs/Hooks.html docs/Importing-from-CVS.html
        docs/Inodeprints.html docs/Internationalization.html
        docs/Key-and-Cert-Trust.html docs/Merging.html
        docs/Migrating-and-Dumping.html docs/Naming-Conventions.html
        docs/Other-Transports.html docs/Quality-Assurance.html
        docs/RCS.html docs/Regexp-Summary.html
        docs/Reserved-Certs.html docs/Reserved-Files.html
        docs/Selectors.html docs/Tree.html docs/Using-packets.html
        docs/Vars.html docs/Versions-of-files.html
        docs/Workspace-Collisions.html docs/index.html
        docs/texinfo.css index.html monotone.html monotone.pdf
        releases.xml
Modified attrs:
        res/merging-fest-transparent.png

ChangeLog: 

merge of '11ead8feb27ae0714e316b19b0f7af856d43cbfa'
     and '2f2e68d81f5a12ebfca4e040fd3644070196126c'


monotone --db={your.database} diff 
--revision=11ead8feb27ae0714e316b19b0f7af856d43cbfa 
--revision=2bd5affacb5bec48dcae50d312a9c76d1bf2b250
monotone --db={your.database} diff 
--revision=2f2e68d81f5a12ebfca4e040fd3644070196126c 
--revision=2bd5affacb5bec48dcae50d312a9c76d1bf2b250
----------------------------------------------------------------------