[Monotone-commits-nodiffs] Revision b8796e95a127055b5c3a2cdf4c3cd715a82e0427

[monotone]

-----------------------------------------------------------------
Revision: b8796e95a127055b5c3a2cdf4c3cd715a82e0427
Ancestor: ee57fe487ffcfd442877e9f43cf6c952fa585ecf
Ancestor: fa33e2026842db04233761f932fb1b52042cc3d5
Author: address@hidden
Date: 2008-08-31T22:17:36
Branch: net.venge.monotone.resolve_conflicts

Deleted entries:
        ROADMAP
Renamed entries:
        util/mtnopt to util/mtnopt.in
Added files:
        tests/resolve_content_conflict/__driver__.lua
        tests/resolve_content_conflict/conflicts-1
        tests/resolve_content_conflict/merge-1
        tests/resolve_content_conflict/resolve-conflicts-1
        tests/resolve_content_conflict/update-1
Added directories:
        tests/resolve_content_conflict
Modified files:
        Makefile.am NEWS README basic_io.cc basic_io.hh
        cmd_merging.cc configure.ac debian/changelog debian/control
        debian/monotone-server.postinst diff_patch.cc diff_patch.hh
        merge.cc merge.hh monotone.texi options_list.hh roster.cc
        roster.hh roster_merge.cc roster_merge.hh testlib.lua
        tests/util_mtnopt/__driver__.lua util/mtnopt.in

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
fa33e2026842db04233761f932fb1b52042cc3d5)
            to branch 'net.venge.monotone.resolve_conflicts' (head 
ee57fe487ffcfd442877e9f43cf6c952fa585ecf)


monotone --db={your.database} diff 
--revision=ee57fe487ffcfd442877e9f43cf6c952fa585ecf 
--revision=b8796e95a127055b5c3a2cdf4c3cd715a82e0427
monotone --db={your.database} diff 
--revision=fa33e2026842db04233761f932fb1b52042cc3d5 
--revision=b8796e95a127055b5c3a2cdf4c3cd715a82e0427
----------------------------------------------------------------------