[Monotone-commits-diffs] Revision 2688e1b4e04c9e015f5b8afc2e669dfe996a7c7a

[monotone]

-----------------------------------------------------------------
Revision: 2688e1b4e04c9e015f5b8afc2e669dfe996a7c7a
Ancestor: 68aa6c199dc8b67d22519ae6b90e89d94fdb5ad9
Ancestor: bcd72297f51ae70136bfd77f10386df5516e0ba3
Author: address@hidden
Date: 2007-08-04T07:34:11
Branch: net.venge.monotone

Added files:
        contrib/Monotone.pm tests/test_a_merge_9/__driver__.lua
        tests/test_a_merge_9/left tests/test_a_merge_9/parent
        tests/test_a_merge_9/right
Added directories:
        tests/test_a_merge_9
Modified files:
        INSTALL NEWS UPGRADE cmd_ws_commit.cc commands.cc
        configure.ac contrib/README contrib/ext_hooks_expand.pl
        contrib/monotone-notify.pl debian/changelog
        debian/monotone-server.postinst
        debian/monotone-server.postrm monotone.spec monotone.texi
        po/de.po po/it.po sqlite/vdbe.c
        tests/clone_warning_with_multiple_heads/__driver__.lua
        tests/rename_file_to_dir/__driver__.lua
        tests/ws_ops_with_wrong_node_type/__driver__.lua
        visualc/config.h win32/monotone.iss work.cc

ChangeLog: 

merge of '68aa6c199dc8b67d22519ae6b90e89d94fdb5ad9'
     and 'bcd72297f51ae70136bfd77f10386df5516e0ba3'


monotone --db={your.database} diff 
--revision=68aa6c199dc8b67d22519ae6b90e89d94fdb5ad9 
--revision=2688e1b4e04c9e015f5b8afc2e669dfe996a7c7a
monotone --db={your.database} diff 
--revision=bcd72297f51ae70136bfd77f10386df5516e0ba3 
--revision=2688e1b4e04c9e015f5b8afc2e669dfe996a7c7a
----------------------------------------------------------------------