[Monotone-commits-nodiffs] Revision 530aa1e59f289e4b44f9f6d31f82635c77533f74

[monotone]

-----------------------------------------------------------------
Revision: 530aa1e59f289e4b44f9f6d31f82635c77533f74
Ancestor: bfbcd812f6ce2654ca9675bc1c9bcf147e22c579
Author: address@hidden
Date: 2010-06-12 15.07.18
Branch: net.venge.monotone.web

Added files:
        wiki/OverwritableNegatableOptions.mdwn
        wiki/UpdateConflicts.mdwn
Modified files:
        wiki/RoadMap.mdwn wiki/ZipperMerge.mdwn

ChangeLog: 

add info on Overwriteable options, update conflicts

* wiki/OverwritableNegatableOptions.mdwn: New file.

* wiki/RoadMap.mdwn: add info on Overwriteable options, update conflicts

* wiki/UpdateConflicts.mdwn: New file.

* wiki/ZipperMerge.mdwn: mention 'mtn conflicts'


monotone --db={your.database} diff 
--revision=bfbcd812f6ce2654ca9675bc1c9bcf147e22c579 
--revision=530aa1e59f289e4b44f9f6d31f82635c77533f74
----------------------------------------------------------------------