[Monotone-commits-nodiffs] Revision 184259296d94033bb62d0775bb0288efefe917d1

[monotone]

-----------------------------------------------------------------
Revision: 184259296d94033bb62d0775bb0288efefe917d1
Ancestor: 424e1cf5155ae4473250978ae6b7e44e12775741
Ancestor: f0eecd8bc9e0a7836267930fdd67fcc074c61081
Author: address@hidden
Date: 2009-01-14T15:28:37
Branch: net.venge.monotone

Added files:
        contrib/display_branches.lua
        tests/attr_mtn_execute/__driver__.lua
        tests/noop_merge_into_workspace/__driver__.lua
Added directories:
        tests/attr_mtn_execute tests/noop_merge_into_workspace
Modified files:
        INSTALL Makefile.am NEWS UPGRADE cmd_automate.cc
        cmd_conflicts.cc cmd_db.cc cmd_merging.cc commands.cc
        configure.ac database.cc database.hh dates.cc dates.hh
        debian/rules gettext.h monotone.cc monotone.spec
        monotone.texi netsync.cc options_list.hh po/de.po po/es.po
        po/fr.po po/sv.po rcs_import.cc rev_types.hh revision.cc
        roster.cc roster_merge.cc
        tests/automate_stdio/__driver__.lua
        tests/netsync_permissions/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc visualc/config.h
        win32/monotone.iss

ChangeLog: 

merge of '424e1cf5155ae4473250978ae6b7e44e12775741'
     and 'f0eecd8bc9e0a7836267930fdd67fcc074c61081'


monotone --db={your.database} diff 
--revision=424e1cf5155ae4473250978ae6b7e44e12775741 
--revision=184259296d94033bb62d0775bb0288efefe917d1
monotone --db={your.database} diff 
--revision=f0eecd8bc9e0a7836267930fdd67fcc074c61081 
--revision=184259296d94033bb62d0775bb0288efefe917d1
----------------------------------------------------------------------