[Monotone-commits-nodiffs] Revision d1677f15a5e36fd112832e161400cf2eb20faa1d

[monotone]

-----------------------------------------------------------------
Revision: d1677f15a5e36fd112832e161400cf2eb20faa1d
Ancestor: 9cdbe3f4051d5c91baa99c56f9d60dd23580b0ce
Author: address@hidden
Date: 2007-02-09T21:12:25
Branch: net.venge.monotone.workspace-merge.noconflict

Added files:
        tests/two_parent_workspace_list/__driver__.lua
Added directories:
        tests/two_parent_workspace_list
Modified files:
        ChangeLog cmd_list.cc testsuite.lua

ChangeLog: 

        * cmd_list.cc (ls_known, ls_changed): Work in a two-parent workspace.
        * tests/two_parent_workspace_list: New test.
        * testsuite.lua: Add it.


monotone --db={your.database} diff 
--revision=9cdbe3f4051d5c91baa99c56f9d60dd23580b0ce 
--revision=d1677f15a5e36fd112832e161400cf2eb20faa1d
----------------------------------------------------------------------