[Monotone-commits-diffs] Revision d5461f7cb66784453d68c20ca647c8b89a66db12

[monotone]

-----------------------------------------------------------------
Revision: d5461f7cb66784453d68c20ca647c8b89a66db12
Ancestor: 55bd9681bc3dd66910847109b449c3fd36b1a1a5
Ancestor: b09e9c0a4e2450c0d347c2d565f4dbbec0c50a8c
Author: address@hidden
Date: 2006-07-12T01:36:33
Branch: net.venge.monotone.multihead

Added files:
        tests/merge_multiple_heads_1/__driver__.lua
Added directories:
        tests/merge_multiple_heads_1
Modified files:
        ChangeLog cmd_merging.cc diff_patch.cc testsuite.lua

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
b09e9c0a4e2450c0d347c2d565f4dbbec0c50a8c)
            to branch 'net.venge.monotone.multihead' (head 
55bd9681bc3dd66910847109b449c3fd36b1a1a5)


monotone --db={your.database} diff 
--revision=55bd9681bc3dd66910847109b449c3fd36b1a1a5 
--revision=d5461f7cb66784453d68c20ca647c8b89a66db12
monotone --db={your.database} diff 
--revision=b09e9c0a4e2450c0d347c2d565f4dbbec0c50a8c 
--revision=d5461f7cb66784453d68c20ca647c8b89a66db12
----------------------------------------------------------------------