[Monotone-commits-diffs] Revision 473c5618ecad08ef37749c58964378823ab7080e

[monotone]

-----------------------------------------------------------------
Revision: 473c5618ecad08ef37749c58964378823ab7080e
Ancestor: 3e3a842f0dabb2070ebe6ddaf79ea84cd141ca61
Ancestor: be6d1b107f9ecc54e5c2bfafe2886aa8844aa0f8
Author: address@hidden
Date: 2007-02-08T00:55:42
Branch: net.venge.monotone.workspace-merge.noconflict

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

ChangeLog: 

merge of '3e3a842f0dabb2070ebe6ddaf79ea84cd141ca61'
     and 'be6d1b107f9ecc54e5c2bfafe2886aa8844aa0f8'


monotone --db={your.database} diff 
--revision=3e3a842f0dabb2070ebe6ddaf79ea84cd141ca61 
--revision=473c5618ecad08ef37749c58964378823ab7080e
monotone --db={your.database} diff 
--revision=be6d1b107f9ecc54e5c2bfafe2886aa8844aa0f8 
--revision=473c5618ecad08ef37749c58964378823ab7080e
----------------------------------------------------------------------