[Monotone-commits-diffs] Revision 74b915ecaf266be46ca18ecf6c51736cf65d96b6

[monotone]

-----------------------------------------------------------------
Revision: 74b915ecaf266be46ca18ecf6c51736cf65d96b6
Ancestor: 89c3ad6a9eb0d235f34aa579c9332f49be1797da
Author: address@hidden
Date: 2007-12-12T05:31:30
Branch: net.venge.monotone.cleanup.conflict-messages

Modified files:
        merge.cc roster_merge.cc
        tests/conflict_messages/__driver__.lua

ChangeLog: 

        * merge.cc (try_to_merge_files): fix compiler warning
        * roster_merge.cc (dump_conflicts): add missing newline
        (multiple_name_plus_helper::make_dn_conflict): rename to ...
        (multiple_name_plus_helper::make_multiple_name_conflict):
        ... this, fixing an incorrect abbreviation
        (multiple_name_plus_helper::check_dn_conflict): rename to ...
        (multiple_name_plus_helper::check_multiple_name_conflict):
        ... this, fixing an incorrect abbreviation
        * tests/conflict_messages/__driver__.lua: test explicit_merge on
        each conflict case; remove stale files to clean up attribute
        conflict test

txt9w4OkXhD3S.txt
Description: Diff [89c3ad6a9eb0d235f34aa579c9332f49be1797da] -> [74b915ecaf266be46ca18ecf6c51736cf65d96b6]