[Monotone-commits-diffs] Revision 088b9661e8240bb20cb77d4d60c18cc8844f2aae

[monotone]

-----------------------------------------------------------------
Revision: 088b9661e8240bb20cb77d4d60c18cc8844f2aae
Ancestor: 6737353b649efad7cfdbb577c755f71984290c58
Ancestor: f875bc679a578f4db099cb41575c65876f1f519a
Author: address@hidden
Date: 2006-10-07T19:23:35
Branch: net.venge.monotone.workspace-merge.noconflict

Renamed entries:
        tests/--author,_--date to tests/_--author,_--date
        tests/--confdir_option_and_get_confdir_lua_function_work to 
tests/_--confdir_option_and_get_confdir_lua_function_work
        tests/--db_with_parent_dir to tests/_--db_with_parent_dir
        tests/--rcfile=- to tests/_--rcfile=-
        tests/--rcfile=directory to tests/_--rcfile=directory
        tests/--rcfile_requires_extant_file to 
tests/_--rcfile_requires_extant_file
Added files:
        tests/pivot_root_to_new_dir/__driver__.lua
Added directories:
        tests/pivot_root_to_new_dir
Modified files:
        ChangeLog Makefile.am cmd.hh lru_writeback_cache.hh po/de.po
        po/pt_BR.po testsuite.lua work.cc work.hh

ChangeLog: 

merge of '6737353b649efad7cfdbb577c755f71984290c58'
     and 'f875bc679a578f4db099cb41575c65876f1f519a'


monotone --db={your.database} diff 
--revision=6737353b649efad7cfdbb577c755f71984290c58 
--revision=088b9661e8240bb20cb77d4d60c18cc8844f2aae
monotone --db={your.database} diff 
--revision=f875bc679a578f4db099cb41575c65876f1f519a 
--revision=088b9661e8240bb20cb77d4d60c18cc8844f2aae
----------------------------------------------------------------------