[Monotone-commits-nodiffs] Revision 3e3a842f0dabb2070ebe6ddaf79ea84cd141ca61

[monotone]

-----------------------------------------------------------------
Revision: 3e3a842f0dabb2070ebe6ddaf79ea84cd141ca61
Ancestor: 712e2202aae0abdebb0fe1a33ac6f2d201e50b49
Author: address@hidden
Date: 2007-02-08T00:49:44
Branch: net.venge.monotone.workspace-merge.noconflict

Modified files:
        ChangeLog cmd_merging.cc
        tests/two_parent_workspace_pluck/__driver__.lua

ChangeLog: 

2007-02-07  Matthew Gregan  <address@hidden>

        * cmd_merging.cc (CMD(pluck)): Migrate to new internal
        multi-parent workspace API.
        * tests/two_parent_workspace_pluck: Un-xfail test.


monotone --db={your.database} diff 
--revision=712e2202aae0abdebb0fe1a33ac6f2d201e50b49 
--revision=3e3a842f0dabb2070ebe6ddaf79ea84cd141ca61
----------------------------------------------------------------------