[Monotone-commits-diffs] Revision d5a981c3442b07bca1a6c7c919f020bdffcaf16c

[monotone]

-----------------------------------------------------------------
Revision: d5a981c3442b07bca1a6c7c919f020bdffcaf16c
Ancestor: 217b716a348bd55636763a2313276818fd9a7362
Ancestor: 734c39bb873f8fc83b8d54a7ad8e7a028864e4fc
Author: address@hidden
Date: 2005-05-24T16:35:25
Branch: net.venge.monotone

Added files:
        tests/t_merge_binary.at
Modified files:
        ChangeLog automate.cc monotone.texi testsuite.at

ChangeLog: 

merge of 217b716a348bd55636763a2313276818fd9a7362
     and 734c39bb873f8fc83b8d54a7ad8e7a028864e4fc


monotone --db={your.database} diff 
--revision=217b716a348bd55636763a2313276818fd9a7362 
--revision=d5a981c3442b07bca1a6c7c919f020bdffcaf16c
monotone --db={your.database} diff 
--revision=734c39bb873f8fc83b8d54a7ad8e7a028864e4fc 
--revision=d5a981c3442b07bca1a6c7c919f020bdffcaf16c
----------------------------------------------------------------------