[Monotone-commits-diffs] Revision f5f5d026e6213ee1962f7a7ada6e06b8e9e20a01

[monotone]

-----------------------------------------------------------------
Revision: f5f5d026e6213ee1962f7a7ada6e06b8e9e20a01
Ancestor: 4954935d44fc8adc43124ae1fff730b129fb980b
Ancestor: 6ab5a63f5ee8f85920f2bd354452ab6c0b31b690
Author: address@hidden
Date: 2005-07-29T04:23:57
Branch: net.venge.monotone

Added files:
        tests/t_merge_add_rename_add.at
Modified files:
        ChangeLog commands.cc monotone.spec tests/t_merge_add_del.at
        tests/t_update_branch.at testsuite.at update.cc

ChangeLog: 

merge of 4954935d44fc8adc43124ae1fff730b129fb980b
     and 6ab5a63f5ee8f85920f2bd354452ab6c0b31b690


monotone --db={your.database} diff 
--revision=4954935d44fc8adc43124ae1fff730b129fb980b 
--revision=f5f5d026e6213ee1962f7a7ada6e06b8e9e20a01
monotone --db={your.database} diff 
--revision=6ab5a63f5ee8f85920f2bd354452ab6c0b31b690 
--revision=f5f5d026e6213ee1962f7a7ada6e06b8e9e20a01
----------------------------------------------------------------------