[Monotone-commits-nodiffs] Revision 7acb06b241bbaf3cd5852dcf9aa7068f578a37eb

[monotone]

-----------------------------------------------------------------
Revision: 7acb06b241bbaf3cd5852dcf9aa7068f578a37eb
Ancestor: 5cce1de48cdb384432a6131423b3a2c307f117a9
Ancestor: cfe411e65a75148a28265758794bfda4742a5837
Author: address@hidden
Date: 2006-07-07T01:47:46
Branch: net.venge.monotone

Added files:
        tests/pluck_basics/__driver__.lua
Added directories:
        tests/pluck_basics
Modified files:
        ChangeLog cmd_merging.cc monotone.texi po/de.po po/fr.po
        po/it.po po/ja.po po/pt_BR.po po/sv.po tester.cc tester.lua
        tests/common/cvs.lua
        tests/fail_cleanly_on_unreadable__MTN_options/__driver__.lua
        tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua
        tests/importing_cvs_files/__driver__.lua testsuite.lua
        unix/inodeprint.cc work.cc

ChangeLog: 

merge of 5cce1de48cdb384432a6131423b3a2c307f117a9
     and cfe411e65a75148a28265758794bfda4742a5837


monotone --db={your.database} diff 
--revision=5cce1de48cdb384432a6131423b3a2c307f117a9 
--revision=7acb06b241bbaf3cd5852dcf9aa7068f578a37eb
monotone --db={your.database} diff 
--revision=cfe411e65a75148a28265758794bfda4742a5837 
--revision=7acb06b241bbaf3cd5852dcf9aa7068f578a37eb
----------------------------------------------------------------------