[Monotone-commits-nodiffs] Revision 8b391bf115b6fa078a79480ec0a9eaa6b188bb20

[monotone]

-----------------------------------------------------------------
Revision: 8b391bf115b6fa078a79480ec0a9eaa6b188bb20
Ancestor: 2030ffe2883cc0d38e7a45753f05abfe30d625fa
Author: address@hidden
Date: 2007-12-09T02:06:17
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): add invalid_name_conflicts
        to the list of conflict types listed
        * roster_merge.{cc,hh}: rename illegal_name_conflict to
        invalid_name_conflict
        * tests/show_conflicts/__driver__.lua: add check to ensure that
        invalid_name_conflicts are listed



monotone --db={your.database} diff 
--revision=2030ffe2883cc0d38e7a45753f05abfe30d625fa 
--revision=8b391bf115b6fa078a79480ec0a9eaa6b188bb20
----------------------------------------------------------------------