[Monotone-commits-diffs] Revision 711d90440247db8d458cbf4e69d79fc380a00980

[monotone]

-----------------------------------------------------------------
Revision: 711d90440247db8d458cbf4e69d79fc380a00980
Ancestor: 1f0c0a67686098a61736f66776e22ce51bb7ab1d
Ancestor: c41733c7acd1fbc08c5d9c7f6f11cf730d63fe26
Author: address@hidden
Date: 2005-07-27T11:19:22
Branch: net.venge.monotone

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

ChangeLog: 

merge of 1f0c0a67686098a61736f66776e22ce51bb7ab1d
     and c41733c7acd1fbc08c5d9c7f6f11cf730d63fe26


monotone --db={your.database} diff 
--revision=1f0c0a67686098a61736f66776e22ce51bb7ab1d 
--revision=711d90440247db8d458cbf4e69d79fc380a00980
monotone --db={your.database} diff 
--revision=c41733c7acd1fbc08c5d9c7f6f11cf730d63fe26 
--revision=711d90440247db8d458cbf4e69d79fc380a00980
----------------------------------------------------------------------