[Monotone-commits-diffs] Revision 0005a23e30a9c2d3024d94773eec433bf9acb770

[monotone]

-----------------------------------------------------------------
Revision: 0005a23e30a9c2d3024d94773eec433bf9acb770
Ancestor: 5bdcfee44a3e2da5fb0e437d3623f2227ea2fed4
Ancestor: 9e65e330c0d76769296452d68d0c52335edb5f1a
Author: address@hidden
Date: 2007-02-09T19:38:56
Branch: net.venge.monotone

Added files:
        tests/locked_workspace/__driver__.lua
Added directories:
        tests/locked_workspace
Modified files:
        ChangeLog file_io.cc netio.hh po/it.po
        tests/test_a_merge_8/correct tests/test_a_merge_8/left
        tests/test_a_merge_8/parent tests/test_a_merge_8/right
        testsuite.lua work.cc

ChangeLog: 

merge of '5bdcfee44a3e2da5fb0e437d3623f2227ea2fed4'
     and '9e65e330c0d76769296452d68d0c52335edb5f1a'


monotone --db={your.database} diff 
--revision=5bdcfee44a3e2da5fb0e437d3623f2227ea2fed4 
--revision=0005a23e30a9c2d3024d94773eec433bf9acb770
monotone --db={your.database} diff 
--revision=9e65e330c0d76769296452d68d0c52335edb5f1a 
--revision=0005a23e30a9c2d3024d94773eec433bf9acb770
----------------------------------------------------------------------