[Monotone-commits-nodiffs] Revision 7a30b55b3e79087bd3aa92172fb5fcfcd4c2a66a

[monotone]

-----------------------------------------------------------------
Revision: 7a30b55b3e79087bd3aa92172fb5fcfcd4c2a66a
Ancestor: 186ddfd9fcc3f6088ee8dc75140fe65c7cabc962
Ancestor: 5d6db58e742e7f985b395a97f645e6b888d3ce5c
Author: address@hidden
Date: 2005-04-19T09:54:43
Branch: net.venge.monotone

Modified files:
        ChangeLog app_state.cc commands.cc contrib/monotone.el
        lua.cc monotone.cc monotone.texi sanity.hh
        tests/t_merge_add_del.at testsuite.at

ChangeLog: 

merge of 186ddfd9fcc3f6088ee8dc75140fe65c7cabc962
     and 5d6db58e742e7f985b395a97f645e6b888d3ce5c


monotone --db={your.database} diff 
--revision=186ddfd9fcc3f6088ee8dc75140fe65c7cabc962 
--revision=7a30b55b3e79087bd3aa92172fb5fcfcd4c2a66a
monotone --db={your.database} diff 
--revision=5d6db58e742e7f985b395a97f645e6b888d3ce5c 
--revision=7a30b55b3e79087bd3aa92172fb5fcfcd4c2a66a
----------------------------------------------------------------------