[Monotone-commits-nodiffs] Revision a549fd1513683f0b6a77aa24e1a9a519cd449a6f

[monotone]

-----------------------------------------------------------------
Revision: a549fd1513683f0b6a77aa24e1a9a519cd449a6f
Ancestor: 6430347efb3282e0ee87533709d9501a91d6cd73
Ancestor: 8f5f10f6cd74d84080a702b1e3a413589ee002d9
Author: address@hidden
Date: 2005-06-05T02:21:21
Branch: net.venge.monotone

Added files:
        contrib/color-logs.conf contrib/color-logs.sh
        contrib/colorize tests/t_cvsimport_drepper.at
        tests/t_restricted_commit_with_inodeprints.at
        tests/t_update_with_pending_add.at
        tests/t_update_with_pending_drop.at
        tests/t_update_with_pending_rename.at
Modified files:
        .mt-attrs AUTHORS ChangeLog HACKING ROADMAP app_state.cc
        app_state.hh automate.cc commands.cc contrib/monotone.el
        monotone.cc monotone.texi netcmd.cc netcmd.hh netsync.cc
        options.hh rcs_import.cc revision.cc revision.hh
        std_hooks.lua testsuite.at

ChangeLog: 

explicit_merge of 6430347efb3282e0ee87533709d9501a91d6cd73
              and 8f5f10f6cd74d84080a702b1e3a413589ee002d9
   using ancestor b36159f960cc04d6ea8161fed3047d118c150598
        to branch 'net.venge.monotone'


monotone --db={your.database} diff 
--revision=6430347efb3282e0ee87533709d9501a91d6cd73 
--revision=a549fd1513683f0b6a77aa24e1a9a519cd449a6f
monotone --db={your.database} diff 
--revision=8f5f10f6cd74d84080a702b1e3a413589ee002d9 
--revision=a549fd1513683f0b6a77aa24e1a9a519cd449a6f
----------------------------------------------------------------------