[Monotone-commits-diffs] Revision 265be67dbec7fbd7db24f155610b377a5aa4b0ce

[monotone]

-----------------------------------------------------------------
Revision: 265be67dbec7fbd7db24f155610b377a5aa4b0ce
Ancestor: 51d38a5367401e9356f383f101651521853e4ec2
Ancestor: 9baf94cb981f2740a28c0c7e7b0c0fbd22fd508a
Author: address@hidden
Date: 2005-04-17T11:19:54
Branch: net.venge.monotone

Added files:
        tests/t_add_stomp_file.at
Modified files:
        ChangeLog commands.cc monotone.texi testsuite.at
        transforms.cc

ChangeLog: 

explicit_merge of 51d38a5367401e9356f383f101651521853e4ec2
              and 9baf94cb981f2740a28c0c7e7b0c0fbd22fd508a
   using ancestor 
        to branch 'net.venge.monotone'

txtGv8KMpAND1.txt
Description: Diff [51d38a5367401e9356f383f101651521853e4ec2] -> [265be67dbec7fbd7db24f155610b377a5aa4b0ce]

txtDBW9GoZ0kn.txt
Description: Diff [9baf94cb981f2740a28c0c7e7b0c0fbd22fd508a] -> [265be67dbec7fbd7db24f155610b377a5aa4b0ce]