[Monotone-commits-diffs] Revision 61b5f6d88594f6d36d7093f03a3b9a38c0b6fb45

[monotone]

-----------------------------------------------------------------
Revision: 61b5f6d88594f6d36d7093f03a3b9a38c0b6fb45
Ancestor: bb8807bc2e9765f6d946684343949a3f63c583c1
Ancestor: e36c20f1fbc447449b51df53d1128c189b9dd6fd
Author: address@hidden
Date: 2007-09-19T07:50:24
Branch: net.venge.monotone.workspace-conflicts

Added files:
        contrib/monotone-mail-notify-standalone.lua
        work_conflicts.hh
Modified files:
        automate.cc cmd_diff_log.cc cmd_files.cc cmd_list.cc
        cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc
        contrib/README database.cc database.hh diff_patch.cc
        merge.cc revision.cc revision.hh roster.cc roster.hh
        roster_merge.cc roster_merge.hh work.cc work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone.workspace-merge.conflict1' (head 
bb8807bc2e9765f6d946684343949a3f63c583c1)
            to branch 'net.venge.monotone.workspace-conflicts' (head 
e36c20f1fbc447449b51df53d1128c189b9dd6fd)


monotone --db={your.database} diff 
--revision=bb8807bc2e9765f6d946684343949a3f63c583c1 
--revision=61b5f6d88594f6d36d7093f03a3b9a38c0b6fb45
monotone --db={your.database} diff 
--revision=e36c20f1fbc447449b51df53d1128c189b9dd6fd 
--revision=61b5f6d88594f6d36d7093f03a3b9a38c0b6fb45
----------------------------------------------------------------------