[Monotone-commits-nodiffs] Revision 1b0ff26144a1ed7b0a5d75f6f88c4f87240c6357

[monotone]

-----------------------------------------------------------------
Revision: 1b0ff26144a1ed7b0a5d75f6f88c4f87240c6357
Ancestor: fca159c5c00ae4158c289f5aabce995378d4e41b
Author: address@hidden
Date: 2007-04-02T14:09:17
Branch: net.venge.monotone.basic_io.inventory

Modified files:
        automate.cc

ChangeLog: 

* automate.cc (inventory): merge fixes, make it multi-parent-aware


monotone --db={your.database} diff 
--revision=fca159c5c00ae4158c289f5aabce995378d4e41b 
--revision=1b0ff26144a1ed7b0a5d75f6f88c4f87240c6357
----------------------------------------------------------------------