[Monotone-commits-diffs] Revision 6e1ff3c9e526c2fa32854f48ef1186b021a21466

[monotone]

-----------------------------------------------------------------
Revision: 6e1ff3c9e526c2fa32854f48ef1186b021a21466
Ancestor: 265be67dbec7fbd7db24f155610b377a5aa4b0ce
Ancestor: fcbab5fadc0152eb00d7c9ccfd8448bec9f33b3a
Author: address@hidden
Date: 2005-04-17T11:21:29
Branch: net.venge.monotone

Added files:
        tests/t_add_stomp_file.at tests/t_database_check_minor.at
Modified files:
        ChangeLog commands.cc database.cc database_check.cc
        monotone.texi netsync.cc sanity.cc sanity.hh
        tests/t_database_check.at tests/t_no_rename_overwrite.at
        testsuite.at transforms.cc work.cc

ChangeLog: 

explicit_merge of 265be67dbec7fbd7db24f155610b377a5aa4b0ce
              and fcbab5fadc0152eb00d7c9ccfd8448bec9f33b3a
   using ancestor 
        to branch 'net.venge.monotone'

txteLxORh6AKF.txt
Description: Diff [265be67dbec7fbd7db24f155610b377a5aa4b0ce] -> [6e1ff3c9e526c2fa32854f48ef1186b021a21466]

txtFhPeLBimti.txt
Description: Diff [fcbab5fadc0152eb00d7c9ccfd8448bec9f33b3a] -> [6e1ff3c9e526c2fa32854f48ef1186b021a21466]