[Monotone-commits-diffs] Revision 9d71d31e65fb4612247076a623f1385c0d881dc7

[monotone]

-----------------------------------------------------------------
Revision: 9d71d31e65fb4612247076a623f1385c0d881dc7
Ancestor: 66e26329a27aa82457f9cab548deec1b494f0c2a
Ancestor: dcf4699c5374c213f5c8aa1b030dbc9fb85a1d46
Author: Timothy Brownawell  <address@hidden>
Date: 2006-02-27T06:16:15
Branch: net.venge.monotone

Added files:
        tests/t_merge_into_dir.at tests/t_show_conflicts.at
Modified files:
        ChangeLog contrib/ciabot_monotone.py schema_migration.cc

ChangeLog: 

merge of 66e26329a27aa82457f9cab548deec1b494f0c2a
     and dcf4699c5374c213f5c8aa1b030dbc9fb85a1d46


monotone --db={your.database} diff 
--revision=66e26329a27aa82457f9cab548deec1b494f0c2a 
--revision=9d71d31e65fb4612247076a623f1385c0d881dc7
monotone --db={your.database} diff 
--revision=dcf4699c5374c213f5c8aa1b030dbc9fb85a1d46 
--revision=9d71d31e65fb4612247076a623f1385c0d881dc7
----------------------------------------------------------------------