[Monotone-commits-diffs] Revision 3ec45b048ced2e2c916abcc7907a0108e154a15d

[monotone]

-----------------------------------------------------------------
Revision: 3ec45b048ced2e2c916abcc7907a0108e154a15d
Ancestor: 99978209a2dce44f04461e0ba72ac9759474b3b9
Author: address@hidden
Date: 2007-02-28T05:41:28
Branch: net.venge.monotone.release-0.33

Modified files:
        tester.cc tests/merge_into_workspace/__driver__.lua
        tests/merge_into_workspace/expected-log
        tests/merge_into_workspace/expected-log-left
        tests/merge_into_workspace/expected-manifest
        tests/merge_into_workspace_attr_corpse/expected-roster
        tests/merge_into_workspace_files_added/expected-revision

ChangeLog: 

applied changes from a617801fcf9e8b2aafacfb0033d7b28295e264e9
             through aded0fbffc3ea081588e26085c2d3d0e23e60498

txtwZcw_zPqKW.txt
Description: Diff [99978209a2dce44f04461e0ba72ac9759474b3b9] -> [3ec45b048ced2e2c916abcc7907a0108e154a15d]