[Monotone-commits-diffs] Revision 245e9ac1ac5b2d3a09650c1d84e10ec9197047f7

[monotone]

-----------------------------------------------------------------
Revision: 245e9ac1ac5b2d3a09650c1d84e10ec9197047f7
Ancestor: b99f93d025cf3b7a86d3114531075eae8bb7eb4c
Ancestor: bae0f1add053fae77e16d857bafefd0d0adffbfc
Author: address@hidden
Date: 2007-02-08T02:38:57
Branch: net.venge.monotone.workspace-merge.noconflict

Added files:
        tests/merge_into_workspace/expected-manifest
        tests/two_parent_workspace_add_drop/__driver__.lua
Added directories:
        tests/two_parent_workspace_add_drop
Modified files:
        ChangeLog automate.cc
        tests/merge_into_workspace/__driver__.lua
        tests/two_parent_workspace_commands_that_fail/__driver__.lua
        testsuite.lua work.cc

ChangeLog: 

merge of 'b99f93d025cf3b7a86d3114531075eae8bb7eb4c'
     and 'bae0f1add053fae77e16d857bafefd0d0adffbfc'


monotone --db={your.database} diff 
--revision=b99f93d025cf3b7a86d3114531075eae8bb7eb4c 
--revision=245e9ac1ac5b2d3a09650c1d84e10ec9197047f7
monotone --db={your.database} diff 
--revision=bae0f1add053fae77e16d857bafefd0d0adffbfc 
--revision=245e9ac1ac5b2d3a09650c1d84e10ec9197047f7
----------------------------------------------------------------------