[Monotone-commits-diffs] Revision 89c3ad6a9eb0d235f34aa579c9332f49be1797da

[monotone]

-----------------------------------------------------------------
Revision: 89c3ad6a9eb0d235f34aa579c9332f49be1797da
Ancestor: 4c0c4c4111dec5c850e3db5c984c889d1b4d4d95
Ancestor: dab5af5f1b4e4aa174ebe3d5f722a71c82006fa3
Author: address@hidden
Date: 2007-12-10T03:55:51
Branch: net.venge.monotone.cleanup.conflict-messages

Deleted entries:
        tests/show_conflicts tests/show_conflicts/__driver__.lua
Added files:
        tests/conflict_messages/__driver__.lua
Added directories:
        tests/conflict_messages
Modified files:
        automate.cc cmd_list.cc cmd_merging.cc cmd_netsync.cc
        cmd_ws_commit.cc database.cc database.hh debian/changelog
        debian/copyright debian/rules diff_patch.cc diff_patch.hh
        file_io.hh merge.cc notes/release-checklist.txt
        numeric_vocab.cc packet.cc paths.hh platform.hh po/de.po
        po/es.po po/it.po po/sv.po roster.cc roster.hh
        roster_merge.cc roster_merge.hh sanity.hh std_hooks.lua
        tester.cc tests/syntax_errors_in_.mtn-ignore/__driver__.lua
        win32/ssh_agent_platform.cc win32/ssh_agent_platform.hh
        work.cc

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
4c0c4c4111dec5c850e3db5c984c889d1b4d4d95)
            to branch 'net.venge.monotone.cleanup.conflict-messages' (head 
dab5af5f1b4e4aa174ebe3d5f722a71c82006fa3)


monotone --db={your.database} diff 
--revision=4c0c4c4111dec5c850e3db5c984c889d1b4d4d95 
--revision=89c3ad6a9eb0d235f34aa579c9332f49be1797da
monotone --db={your.database} diff 
--revision=dab5af5f1b4e4aa174ebe3d5f722a71c82006fa3 
--revision=89c3ad6a9eb0d235f34aa579c9332f49be1797da
----------------------------------------------------------------------