[Monotone-commits-diffs] Revision c41733c7acd1fbc08c5d9c7f6f11cf730d63fe26

[monotone]

-----------------------------------------------------------------
Revision: c41733c7acd1fbc08c5d9c7f6f11cf730d63fe26
Ancestor: 6572be076a1c2d4e54957e0d65564a66089dccb8
Ancestor: bd26fc55a18a081ace39299c6be5b4dd18e580d4
Author: address@hidden
Date: 2005-07-27T11:41:38
Branch: net.venge.monotone

Added files:
        tests/t_merge_add_rename_add.at
Modified files:
        ChangeLog change_set.cc commands.cc tests/t_merge_add_del.at
        testsuite.at

ChangeLog: 

merge of 6572be076a1c2d4e54957e0d65564a66089dccb8
     and bd26fc55a18a081ace39299c6be5b4dd18e580d4


monotone --db={your.database} diff 
--revision=6572be076a1c2d4e54957e0d65564a66089dccb8 
--revision=c41733c7acd1fbc08c5d9c7f6f11cf730d63fe26
monotone --db={your.database} diff 
--revision=bd26fc55a18a081ace39299c6be5b4dd18e580d4 
--revision=c41733c7acd1fbc08c5d9c7f6f11cf730d63fe26
----------------------------------------------------------------------