[Monotone-commits-diffs] Revision b63b54d8b8c98ac51ce629aa25e8189a1d371e50

[monotone]

-----------------------------------------------------------------
Revision: b63b54d8b8c98ac51ce629aa25e8189a1d371e50
Ancestor: 65dc9b68313cbd1c463eac1575c0e5c88a51c370
Ancestor: 9b037c173f4f0dc38045caae6562672f60000dd6
Author: Thomas Moschny <address@hidden>
Date: 2007-02-28T03:40:28
Branch: net.venge.monotone

Modified files:
        contrib/ciabot_monotone_hookversion.py tester.cc
        tests/merge_into_workspace/__driver__.lua
        tests/merge_into_workspace/expected-log
        tests/merge_into_workspace/expected-log-left
        tests/merge_into_workspace/expected-manifest
        tests/merge_into_workspace_attr_corpse/expected-roster
        tests/merge_into_workspace_files_added/expected-revision

ChangeLog: 

merge of '65dc9b68313cbd1c463eac1575c0e5c88a51c370'
     and '9b037c173f4f0dc38045caae6562672f60000dd6'


monotone --db={your.database} diff 
--revision=65dc9b68313cbd1c463eac1575c0e5c88a51c370 
--revision=b63b54d8b8c98ac51ce629aa25e8189a1d371e50
monotone --db={your.database} diff 
--revision=9b037c173f4f0dc38045caae6562672f60000dd6 
--revision=b63b54d8b8c98ac51ce629aa25e8189a1d371e50
----------------------------------------------------------------------