[Monotone-commits-diffs] Revision ad7f0398ac9340255d329579362cfaf56ab42ef0

[monotone]

-----------------------------------------------------------------
Revision: ad7f0398ac9340255d329579362cfaf56ab42ef0
Ancestor: 0be979256ad160bbd12ca8352f87240fd842fd39
Ancestor: d1677f15a5e36fd112832e161400cf2eb20faa1d
Author: address@hidden
Date: 2007-02-09T21:13:53
Branch: net.venge.monotone.workspace-merge.noconflict

Added files:
        tests/two_parent_workspace_inodeprints/__driver__.lua
        tests/two_parent_workspace_list/__driver__.lua
Added directories:
        tests/two_parent_workspace_inodeprints
        tests/two_parent_workspace_list
Modified files:
        ChangeLog cmd_list.cc testsuite.lua work.cc

ChangeLog: 

merge of '0be979256ad160bbd12ca8352f87240fd842fd39'
     and 'd1677f15a5e36fd112832e161400cf2eb20faa1d'


monotone --db={your.database} diff 
--revision=0be979256ad160bbd12ca8352f87240fd842fd39 
--revision=ad7f0398ac9340255d329579362cfaf56ab42ef0
monotone --db={your.database} diff 
--revision=d1677f15a5e36fd112832e161400cf2eb20faa1d 
--revision=ad7f0398ac9340255d329579362cfaf56ab42ef0
----------------------------------------------------------------------