[Monotone-commits-nodiffs] Revision e132e7d88988641dba2dc25c7700e2b5421dd328

[monotone]

-----------------------------------------------------------------
Revision: e132e7d88988641dba2dc25c7700e2b5421dd328
Ancestor: ce10d3cb65fb30cee70be561de455c1a0023fbb5
Author: address@hidden
Date: 2006-05-18T20:45:51
Branch: net.venge.monotone

Renamed entries:
        tests/t_merge_lca.at to tests/t_merge_7.at
Modified files:
        ChangeLog tests/t_merge_7.at testsuite.at

ChangeLog: 

2006-05-18  Matthew Gregan  <address@hidden>

        * testsuite.at, t_merge_lca.at: Rename to t_merge_7.at, tweak
        comments to reflect that this used to test --lca, but now is
        simply another merge test.


monotone --db={your.database} diff 
--revision=ce10d3cb65fb30cee70be561de455c1a0023fbb5 
--revision=e132e7d88988641dba2dc25c7700e2b5421dd328
----------------------------------------------------------------------