[Monotone-commits-diffs] Revision b92e244213eed4c494a461381c8553b08b5d3a90

[monotone]

-----------------------------------------------------------------
Revision: b92e244213eed4c494a461381c8553b08b5d3a90
Ancestor: 245e9ac1ac5b2d3a09650c1d84e10ec9197047f7
Ancestor: 39a06f280cd934bb8a608d98b32f9734f8c04e5f
Author: address@hidden
Date: 2007-02-08T05:49:36
Branch: net.venge.monotone.workspace-merge.noconflict

Added files:
        tests/two_parent_workspace_add_drop/__driver__.lua
        tests/two_parent_workspace_attrs/__driver__.lua
Added directories:
        tests/two_parent_workspace_add_drop
        tests/two_parent_workspace_attrs
Modified files:
        ChangeLog cmd_ws_commit.cc
        tests/two_parent_workspace_pluck/__driver__.lua
        testsuite.lua work.cc

ChangeLog: 

merge of '245e9ac1ac5b2d3a09650c1d84e10ec9197047f7'
     and '39a06f280cd934bb8a608d98b32f9734f8c04e5f'


monotone --db={your.database} diff 
--revision=245e9ac1ac5b2d3a09650c1d84e10ec9197047f7 
--revision=b92e244213eed4c494a461381c8553b08b5d3a90
monotone --db={your.database} diff 
--revision=39a06f280cd934bb8a608d98b32f9734f8c04e5f 
--revision=b92e244213eed4c494a461381c8553b08b5d3a90
----------------------------------------------------------------------