[Monotone-commits-nodiffs] Revision 73d0c6ab78eee0446b13f9334490271bb4b51c35

[monotone]

-----------------------------------------------------------------
Revision: 73d0c6ab78eee0446b13f9334490271bb4b51c35
Ancestor: 3b1063a4df92d0c66ea044b8c9054e77dd45f06f
Ancestor: 69ff2ac8842ce78c62bdb0e4ac366b886d68cf63
Author: address@hidden
Date: 2007-02-06T06:14:49
Branch: net.venge.monotone

Added files:
        tests/test_a_merge_8/__driver__.lua
        tests/test_a_merge_8/correct tests/test_a_merge_8/left
        tests/test_a_merge_8/parent tests/test_a_merge_8/right
Added directories:
        tests/test_a_merge_8
Modified files:
        ChangeLog cmd_diff_log.cc po/it.po po/sv.po testsuite.lua

ChangeLog: 

merge of '3b1063a4df92d0c66ea044b8c9054e77dd45f06f'
     and '69ff2ac8842ce78c62bdb0e4ac366b886d68cf63'


monotone --db={your.database} diff 
--revision=3b1063a4df92d0c66ea044b8c9054e77dd45f06f 
--revision=73d0c6ab78eee0446b13f9334490271bb4b51c35
monotone --db={your.database} diff 
--revision=69ff2ac8842ce78c62bdb0e4ac366b886d68cf63 
--revision=73d0c6ab78eee0446b13f9334490271bb4b51c35
----------------------------------------------------------------------