[Monotone-commits-nodiffs] Revision 9d8c92fc394a058c48dc67caea7b78a7f18968ea

[monotone]

-----------------------------------------------------------------
Revision: 9d8c92fc394a058c48dc67caea7b78a7f18968ea
Ancestor: 3befc7cb6ed014757134d403ecf3618ec98e44d2
Ancestor: ff3eb0cbfd45c6da3730ed3dc0c09a45b9d7c084
Author: address@hidden
Date: 2007-09-25T13:53:32
Branch: net.venge.monotone.workspace-conflicts

Added files:
        work_conflicts.hh
Modified files:
        cmd_merging.cc merge.cc roster_merge.cc roster_merge.hh
        std_hooks.lua

ChangeLog: 

propagate from branch 'net.venge.monotone.work-rev-refactor' (head 
3befc7cb6ed014757134d403ecf3618ec98e44d2)
            to branch 'net.venge.monotone.workspace-conflicts' (head 
ff3eb0cbfd45c6da3730ed3dc0c09a45b9d7c084)


monotone --db={your.database} diff 
--revision=3befc7cb6ed014757134d403ecf3618ec98e44d2 
--revision=9d8c92fc394a058c48dc67caea7b78a7f18968ea
monotone --db={your.database} diff 
--revision=ff3eb0cbfd45c6da3730ed3dc0c09a45b9d7c084 
--revision=9d8c92fc394a058c48dc67caea7b78a7f18968ea
----------------------------------------------------------------------