[Monotone-commits-nodiffs] Revision fa63821d3fb44b8ea6134c530f0e71a7ac53d55e

[monotone]

-----------------------------------------------------------------
Revision: fa63821d3fb44b8ea6134c530f0e71a7ac53d55e
Ancestor: db746f5ec12d4d35c64f103db7c7a98baf574dd5
Author: Matt Johnston <address@hidden>
Date: 2005-11-23T14:41:50
Branch: net.venge.monotone.experiment.rosters

Modified files:
        roster_merge.cc

ChangeLog: 

* roster_merge.cc: don't try to include files that have been deleted
when merging. 6 more tests pass.


monotone --db={your.database} diff 
--revision=db746f5ec12d4d35c64f103db7c7a98baf574dd5 
--revision=fa63821d3fb44b8ea6134c530f0e71a7ac53d55e
----------------------------------------------------------------------