[Monotone-commits-diffs] Revision 2490479a4e4e99243fead6d627d78291fde592f0

[monotone]

-----------------------------------------------------------------
Revision: 2490479a4e4e99243fead6d627d78291fde592f0
Ancestor: 3be5a9039a96e4e0cf3db343eb3a59800cf4b1bd
Ancestor: 82f666b14a51a3982b9564048534ccb474d4e5cc
Author: address@hidden
Date: 2005-05-20T19:15:17
Branch: net.venge.monotone

Added files:
        tests/t_drop_vs_dropadd.at
Modified files:
        ChangeLog change_set.cc monotone.texi packet.cc testsuite.at

ChangeLog: 

merge of 3be5a9039a96e4e0cf3db343eb3a59800cf4b1bd
     and 82f666b14a51a3982b9564048534ccb474d4e5cc


monotone --db={your.database} diff 
--revision=3be5a9039a96e4e0cf3db343eb3a59800cf4b1bd 
--revision=2490479a4e4e99243fead6d627d78291fde592f0
monotone --db={your.database} diff 
--revision=82f666b14a51a3982b9564048534ccb474d4e5cc 
--revision=2490479a4e4e99243fead6d627d78291fde592f0
----------------------------------------------------------------------