[Monotone-commits-diffs] Revision 712e2202aae0abdebb0fe1a33ac6f2d201e50b49

[monotone]

-----------------------------------------------------------------
Revision: 712e2202aae0abdebb0fe1a33ac6f2d201e50b49
Ancestor: cabb2dd789d55ae6063f061502612cf28e230b24
Ancestor: ccc72170166d63971e1edc434483ccd14f571cb0
Author: address@hidden
Date: 2007-02-07T23:28:42
Branch: net.venge.monotone.workspace-merge.noconflict

Added files:
        tests/merge_into_workspace_same_rev/__driver__.lua
        tests/two_parent_workspace_commands_that_fail/__driver__.lua
        tests/two_parent_workspace_pluck/__driver__.lua
Added directories:
        tests/merge_into_workspace_same_rev
        tests/two_parent_workspace_commands_that_fail
        tests/two_parent_workspace_pluck
Modified files:
        ChangeLog cmd_merging.cc testsuite.lua

ChangeLog: 

explicit merge of 'cabb2dd789d55ae6063f061502612cf28e230b24'
              and 'ccc72170166d63971e1edc434483ccd14f571cb0'


monotone --db={your.database} diff 
--revision=cabb2dd789d55ae6063f061502612cf28e230b24 
--revision=712e2202aae0abdebb0fe1a33ac6f2d201e50b49
monotone --db={your.database} diff 
--revision=ccc72170166d63971e1edc434483ccd14f571cb0 
--revision=712e2202aae0abdebb0fe1a33ac6f2d201e50b49
----------------------------------------------------------------------