[Monotone-commits-diffs] Revision 2030ffe2883cc0d38e7a45753f05abfe30d625fa

[monotone]

-----------------------------------------------------------------
Revision: 2030ffe2883cc0d38e7a45753f05abfe30d625fa
Ancestor: 3e61a21f0d48e7a9ca4aa1e20a0788904a4f5f65
Author: address@hidden
Date: 2007-12-08T20:59:40
Branch: net.venge.monotone.cleanup.conflict-messages

Modified files:
        cmd_merging.cc roster_merge.cc roster_merge.hh
        tests/show_conflicts/__driver__.lua

ChangeLog: 

        * cmd_merging.cc (show_conflicts):
        * roster_merge.{cc,hh):
        * tests/show_coflicts/__driver__.lua:
        rename divergent_name_conflict to multiple_name_conflict;
        rename convergent_name_conflict to duplicate_name_conflict;
        rename node_attr_conflict to attribute_conflict

txtoXIROnCDTI.txt
Description: Diff [3e61a21f0d48e7a9ca4aa1e20a0788904a4f5f65] -> [2030ffe2883cc0d38e7a45753f05abfe30d625fa]