[Monotone-commits-nodiffs] Revision dcf4699c5374c213f5c8aa1b030dbc9fb85a1d46

[monotone]

-----------------------------------------------------------------
Revision: dcf4699c5374c213f5c8aa1b030dbc9fb85a1d46
Ancestor: 96b652def6b8b29fdfdc93d5c3c70633fc8f9a2a
Author: Timothy Brownawell  <address@hidden>
Date: 2006-02-27T06:15:56
Branch: net.venge.monotone

Added files:
        tests/t_merge_into_dir.at tests/t_show_conflicts.at

ChangeLog: 

really add tests/t_{merge_into_dir,show_conflicts}.at this time

monotone --db={your.database} diff 
--revision=96b652def6b8b29fdfdc93d5c3c70633fc8f9a2a 
--revision=dcf4699c5374c213f5c8aa1b030dbc9fb85a1d46
----------------------------------------------------------------------