[Monotone-commits-nodiffs] Revision 5add478f10701aaffa00326cb20227046f5412fc

[monotone]

-----------------------------------------------------------------
Revision: 5add478f10701aaffa00326cb20227046f5412fc
Ancestor: 58506596ede2958325d874bf5891435a05400065
Author: address@hidden
Date: 2005-08-16T04:05:36
Branch: net.venge.monotone

Added files:
        tests/t_explicit_merge_with_anc.at
Modified files:
        ChangeLog testsuite.at

ChangeLog: 

2005-08-15  Nathaniel Smith  <address@hidden>

        * tests/t_explicit_merge_with_anc.at: New test.
        * testsuite.at: Add it.


monotone --db={your.database} diff 
--revision=58506596ede2958325d874bf5891435a05400065 
--revision=5add478f10701aaffa00326cb20227046f5412fc
----------------------------------------------------------------------