[Monotone-commits-diffs] Revision 4f406612f86b2cd074716eb3cadafc48fecbe329

[monotone]

-----------------------------------------------------------------
Revision: 4f406612f86b2cd074716eb3cadafc48fecbe329
Ancestor: 0b3dcd68ad2ca32126a552c2a27d7fb1f861dd0f
Ancestor: 9d824b1845797d1a7934112b3854f82731e24572
Author: address@hidden
Date: 2006-03-14T18:32:50
Branch: net.venge.monotone

Added files:
        tests/t_serve_ignores_mt_options.at
Modified files:
        ChangeLog app_state.cc app_state.hh commands.cc configure.ac
        monotone.cc monotone.texi netsync.cc po/fr.po roster.cc
        tests/t_dump_load.at testsuite.at

ChangeLog: 

merge of 0b3dcd68ad2ca32126a552c2a27d7fb1f861dd0f
     and 9d824b1845797d1a7934112b3854f82731e24572


monotone --db={your.database} diff 
--revision=0b3dcd68ad2ca32126a552c2a27d7fb1f861dd0f 
--revision=4f406612f86b2cd074716eb3cadafc48fecbe329
monotone --db={your.database} diff 
--revision=9d824b1845797d1a7934112b3854f82731e24572 
--revision=4f406612f86b2cd074716eb3cadafc48fecbe329
----------------------------------------------------------------------