[Monotone-commits-diffs] Revision c725ed4ffd15f82908b3bd18828e3df9aa8ee0be

[monotone]

-----------------------------------------------------------------
Revision: c725ed4ffd15f82908b3bd18828e3df9aa8ee0be
Ancestor: 5f23879952478b3f5b2956f569c8b2ff87416414
Ancestor: d582f22991fce64056a5fc1eeeb7078bb23d9674
Author: address@hidden
Date: 2005-10-24T21:21:36
Branch: net.venge.monotone.experiment.rosters

Added files:
        merge.cc merge.hh parallel_iter.hh roster_merge.cc
        roster_merge.hh
Modified files:
        Makefile.am app_state.cc app_state.hh automate.cc
        commands.cc cset.hh netsync.cc restrictions.cc revision.cc
        revision.hh roster.cc roster.hh

ChangeLog: 

merge of 5f23879952478b3f5b2956f569c8b2ff87416414
     and d582f22991fce64056a5fc1eeeb7078bb23d9674


monotone --db={your.database} diff 
--revision=5f23879952478b3f5b2956f569c8b2ff87416414 
--revision=c725ed4ffd15f82908b3bd18828e3df9aa8ee0be
monotone --db={your.database} diff 
--revision=d582f22991fce64056a5fc1eeeb7078bb23d9674 
--revision=c725ed4ffd15f82908b3bd18828e3df9aa8ee0be
----------------------------------------------------------------------