Viewing all changes in revision 5321.2.8.
- Committer: Vincent Ladeuil
- Date: 2010-12-06 14:15:15 UTC
- mto: (5321.1.101 mergetools)
- mto: This revision was merged to the branch mainline in revision 5632.
- Revision ID: v.ladeuil+lp@free.fr-20101206141515-s6oa96cj01ley5s3
_KNOWN_MERGE_TOOLS should be a dict (there is an hidden assumption that the merg tool is unique anyway).
- files modified:
- bzrlib/mergetools.py
expand all
collapse all
added
removed
