[Monotone-commits-nodiffs] Revision 3cfc55ef3b519a4f0a7fe6592949c821f302fae9

[monotone]

-----------------------------------------------------------------
Revision: 3cfc55ef3b519a4f0a7fe6592949c821f302fae9
Ancestor: 82b2e4055d112a1a198e7542a2834808f5848e10
Author: address@hidden
Date: 2005-10-24T10:14:11
Branch: net.venge.monotone.experiment.rosters

Added files:
        merge.cc merge.hh
Modified files:
        Makefile.am app_state.cc app_state.hh commands.cc
        roster_merge.hh

ChangeLog: 

refactor to get rid of string_to_datetime
remove try_one_merge
initial lame (untested and no conflict resolution) implementation of
  'merge' and 'propagate'


monotone --db={your.database} diff 
--revision=82b2e4055d112a1a198e7542a2834808f5848e10 
--revision=3cfc55ef3b519a4f0a7fe6592949c821f302fae9
----------------------------------------------------------------------